diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-12-13 03:33:53 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-13 12:05:47 -0500 |
commit | d78437245aa3842e8eeaef2709753ac485465652 (patch) | |
tree | 42ca5c01dcf10553c984be9b87bc3aa20984e15a | |
parent | 39f07223d400330b9e08aae4c77a391f2418023e (diff) |
[PATCH] i2o_exec_exit and i2o_driver_exit should not be __exit.
i2o_exec_exit and i2o_driver_exit were marked as __exit which is a bug
because both are invoked from __init and __exit functions.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Cc: Markus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/message/i2o/core.h | 4 | ||||
-rw-r--r-- | drivers/message/i2o/driver.c | 2 | ||||
-rw-r--r-- | drivers/message/i2o/exec-osm.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/message/i2o/core.h b/drivers/message/i2o/core.h index dc388a3ff5e0..cbe384fb848c 100644 --- a/drivers/message/i2o/core.h +++ b/drivers/message/i2o/core.h | |||
@@ -18,7 +18,7 @@ extern struct i2o_driver i2o_exec_driver; | |||
18 | extern int i2o_exec_lct_get(struct i2o_controller *); | 18 | extern int i2o_exec_lct_get(struct i2o_controller *); |
19 | 19 | ||
20 | extern int __init i2o_exec_init(void); | 20 | extern int __init i2o_exec_init(void); |
21 | extern void __exit i2o_exec_exit(void); | 21 | extern void i2o_exec_exit(void); |
22 | 22 | ||
23 | /* driver */ | 23 | /* driver */ |
24 | extern struct bus_type i2o_bus_type; | 24 | extern struct bus_type i2o_bus_type; |
@@ -26,7 +26,7 @@ extern struct bus_type i2o_bus_type; | |||
26 | extern int i2o_driver_dispatch(struct i2o_controller *, u32); | 26 | extern int i2o_driver_dispatch(struct i2o_controller *, u32); |
27 | 27 | ||
28 | extern int __init i2o_driver_init(void); | 28 | extern int __init i2o_driver_init(void); |
29 | extern void __exit i2o_driver_exit(void); | 29 | extern void i2o_driver_exit(void); |
30 | 30 | ||
31 | /* PCI */ | 31 | /* PCI */ |
32 | extern int __init i2o_pci_init(void); | 32 | extern int __init i2o_pci_init(void); |
diff --git a/drivers/message/i2o/driver.c b/drivers/message/i2o/driver.c index 9104b65ff70f..d3235f213c89 100644 --- a/drivers/message/i2o/driver.c +++ b/drivers/message/i2o/driver.c | |||
@@ -362,7 +362,7 @@ int __init i2o_driver_init(void) | |||
362 | * | 362 | * |
363 | * Unregisters the I2O bus and frees driver array. | 363 | * Unregisters the I2O bus and frees driver array. |
364 | */ | 364 | */ |
365 | void __exit i2o_driver_exit(void) | 365 | void i2o_driver_exit(void) |
366 | { | 366 | { |
367 | bus_unregister(&i2o_bus_type); | 367 | bus_unregister(&i2o_bus_type); |
368 | kfree(i2o_drivers); | 368 | kfree(i2o_drivers); |
diff --git a/drivers/message/i2o/exec-osm.c b/drivers/message/i2o/exec-osm.c index 902753b2c661..a539d3b61e76 100644 --- a/drivers/message/i2o/exec-osm.c +++ b/drivers/message/i2o/exec-osm.c | |||
@@ -595,7 +595,7 @@ int __init i2o_exec_init(void) | |||
595 | * | 595 | * |
596 | * Unregisters the Exec OSM from the I2O core. | 596 | * Unregisters the Exec OSM from the I2O core. |
597 | */ | 597 | */ |
598 | void __exit i2o_exec_exit(void) | 598 | void i2o_exec_exit(void) |
599 | { | 599 | { |
600 | i2o_driver_unregister(&i2o_exec_driver); | 600 | i2o_driver_unregister(&i2o_exec_driver); |
601 | }; | 601 | }; |