Skip to content

Commit

Permalink
[PATCH] Char: stallion, correct __init macros
Browse files Browse the repository at this point in the history
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: Jiri Slaby <jirislaby@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Dec 8, 2006
1 parent 3b85b34 commit 705c186
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/char/stallion.c
Original file line number Diff line number Diff line change
Expand Up @@ -1923,7 +1923,7 @@ static void stl_offintr(struct work_struct *work)
* 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;
int chipmask, i;
Expand Down Expand Up @@ -1995,7 +1995,7 @@ static void stl_cleanup_panels(struct stlbrd *brdp)
* 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;
unsigned int status;
Expand Down Expand Up @@ -2148,7 +2148,7 @@ static int __init stl_initeio(struct stlbrd *brdp)
* 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;
unsigned int status, nxtid, ioaddr, conflict;
Expand Down Expand Up @@ -2372,7 +2372,7 @@ static int __init stl_initech(struct stlbrd *brdp)
* 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;

Expand Down Expand Up @@ -2438,7 +2438,7 @@ static int __init stl_brdinit(struct stlbrd *brdp)
* Find the next available board number that is free.
*/

static int __init stl_getbrdnr(void)
static int __devinit stl_getbrdnr(void)
{
int i;

Expand Down

0 comments on commit 705c186

Please sign in to comment.