[PATCH] i2o_exec_exit and i2o_driver_exit should not be __exit.

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Ralf Baechle and committed by

Linus Torvalds 19 years ago d7843724 39f07223

+4 -4

3 changed files

expand all

drivers

message

i2o

core.h

driver.c

exec-osm.c

+2 -2

drivers/message/i2o/core.h

··· 18 18 extern int i2o_exec_lct_get(struct i2o_controller *); 19 19 20 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 23 /* driver */ 24 24 extern struct bus_type i2o_bus_type; ··· 26 26 extern int i2o_driver_dispatch(struct i2o_controller *, u32); 27 27 28 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 31 /* PCI */ 32 32 extern int __init i2o_pci_init(void);

+1 -1

drivers/message/i2o/driver.c

··· 362 362 * 363 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 367 bus_unregister(&i2o_bus_type); 368 368 kfree(i2o_drivers);

+1 -1

drivers/message/i2o/exec-osm.c

··· 595 595 * 596 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 600 i2o_driver_unregister(&i2o_exec_driver); 601 601 };