Skip to contentSkip to conversation

Char: stallion, correct __init macros

PATCH In review Jiri Slaby 1 participant 1 message Oct 22, 2006 Char and misc drivers

lore
Share & tools
lore

Jiri Slaby

author
#0 lore raw

PATCH 4/4 Char: stallion, correct __init macros

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.

---
commit a3d771ef92954ce81363af9e0252490e2741fc21
tree 050ba1de2cddfe4a8a83ff084022d610c0580df0
parent 193f82ab45ee71c37cac356fd1afed8295d80b1e
author Jiri Slaby <[email protected]> Sun, 22 Oct 2006 17:22:09 +0159 committer Jiri Slaby <[email protected]> Sun, 22 Oct 2006 17:22:09 +0159

 drivers/char/stallion.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
drivers/char/stallion.c +5 -5
index 73312c3..7ab9cee 100644
@@ -1925,7 +1925,7 @@ static void stl_offintr(void *private)
  *	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;
@@ -1997,7 +1997,7 @@ static void stl_cleanup_panels(struct st
  *	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;
@@ -2150,7 +2150,7 @@ err:
  *	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;
@@ -2374,7 +2374,7 @@ err:
  *	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;
 
@@ -2440,7 +2440,7 @@ err:
  *	Find the next available board number that is free.
  */
 
-static int __init stl_getbrdnr(void)
+static int __devinit stl_getbrdnr(void)
 {
 	int	i;