Commit 705c1862 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds

[PATCH] Char: stallion, correct __init macros

Some functions are now called from pci probing functiuon which is __devinit,
not __init, correct this to not free functions after init if hotplug enabled.
Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3b85b341
...@@ -1923,7 +1923,7 @@ static void stl_offintr(struct work_struct *work) ...@@ -1923,7 +1923,7 @@ static void stl_offintr(struct work_struct *work)
* Initialize all the ports on a panel. * Initialize all the ports on a panel.
*/ */
static int __init stl_initports(struct stlbrd *brdp, struct stlpanel *panelp) static int __devinit stl_initports(struct stlbrd *brdp, struct stlpanel *panelp)
{ {
struct stlport *portp; struct stlport *portp;
int chipmask, i; int chipmask, i;
...@@ -1995,7 +1995,7 @@ static void stl_cleanup_panels(struct stlbrd *brdp) ...@@ -1995,7 +1995,7 @@ static void stl_cleanup_panels(struct stlbrd *brdp)
* Try to find and initialize an EasyIO board. * Try to find and initialize an EasyIO board.
*/ */
static int __init stl_initeio(struct stlbrd *brdp) static int __devinit stl_initeio(struct stlbrd *brdp)
{ {
struct stlpanel *panelp; struct stlpanel *panelp;
unsigned int status; unsigned int status;
...@@ -2148,7 +2148,7 @@ err: ...@@ -2148,7 +2148,7 @@ err:
* dealing with all types of ECH board. * dealing with all types of ECH board.
*/ */
static int __init stl_initech(struct stlbrd *brdp) static int __devinit stl_initech(struct stlbrd *brdp)
{ {
struct stlpanel *panelp; struct stlpanel *panelp;
unsigned int status, nxtid, ioaddr, conflict; unsigned int status, nxtid, ioaddr, conflict;
...@@ -2372,7 +2372,7 @@ err: ...@@ -2372,7 +2372,7 @@ err:
* since the initial search and setup is very different. * since the initial search and setup is very different.
*/ */
static int __init stl_brdinit(struct stlbrd *brdp) static int __devinit stl_brdinit(struct stlbrd *brdp)
{ {
int i, retval; int i, retval;
...@@ -2438,7 +2438,7 @@ err: ...@@ -2438,7 +2438,7 @@ err:
* Find the next available board number that is free. * Find the next available board number that is free.
*/ */
static int __init stl_getbrdnr(void) static int __devinit stl_getbrdnr(void)
{ {
int i; int i;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment