aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2006-12-08 05:39:11 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:59 -0500
commit705c186241844ba2103d15fc210dbf1def9bc3f0 (patch)
treece150730b75e3ad4613883df53c1945d331fe013 /drivers/char
parent3b85b3413df1feb2b4ef17d829c1ee895fc64075 (diff)
[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: 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>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/stallion.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index 24bdb48310c2..596e69c2fd0c 100644
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -1923,7 +1923,7 @@ static void stl_offintr(struct work_struct *work)
1923 * Initialize all the ports on a panel. 1923 * Initialize all the ports on a panel.
1924 */ 1924 */
1925 1925
1926static int __init stl_initports(struct stlbrd *brdp, struct stlpanel *panelp) 1926static int __devinit stl_initports(struct stlbrd *brdp, struct stlpanel *panelp)
1927{ 1927{
1928 struct stlport *portp; 1928 struct stlport *portp;
1929 int chipmask, i; 1929 int chipmask, i;
@@ -1995,7 +1995,7 @@ static void stl_cleanup_panels(struct stlbrd *brdp)
1995 * Try to find and initialize an EasyIO board. 1995 * Try to find and initialize an EasyIO board.
1996 */ 1996 */
1997 1997
1998static int __init stl_initeio(struct stlbrd *brdp) 1998static int __devinit stl_initeio(struct stlbrd *brdp)
1999{ 1999{
2000 struct stlpanel *panelp; 2000 struct stlpanel *panelp;
2001 unsigned int status; 2001 unsigned int status;
@@ -2148,7 +2148,7 @@ err:
2148 * dealing with all types of ECH board. 2148 * dealing with all types of ECH board.
2149 */ 2149 */
2150 2150
2151static int __init stl_initech(struct stlbrd *brdp) 2151static int __devinit stl_initech(struct stlbrd *brdp)
2152{ 2152{
2153 struct stlpanel *panelp; 2153 struct stlpanel *panelp;
2154 unsigned int status, nxtid, ioaddr, conflict; 2154 unsigned int status, nxtid, ioaddr, conflict;
@@ -2372,7 +2372,7 @@ err:
2372 * since the initial search and setup is very different. 2372 * since the initial search and setup is very different.
2373 */ 2373 */
2374 2374
2375static int __init stl_brdinit(struct stlbrd *brdp) 2375static int __devinit stl_brdinit(struct stlbrd *brdp)
2376{ 2376{
2377 int i, retval; 2377 int i, retval;
2378 2378
@@ -2438,7 +2438,7 @@ err:
2438 * Find the next available board number that is free. 2438 * Find the next available board number that is free.
2439 */ 2439 */
2440 2440
2441static int __init stl_getbrdnr(void) 2441static int __devinit stl_getbrdnr(void)
2442{ 2442{
2443 int i; 2443 int i;
2444 2444