Skip to content

Commit

Permalink
[PATCH] i2o_exec_exit and i2o_driver_exit should not be __exit.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ralf Baechle authored and Linus Torvalds committed Dec 13, 2006
1 parent 39f0722 commit d784372
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions drivers/message/i2o/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ extern struct i2o_driver i2o_exec_driver;
extern int i2o_exec_lct_get(struct i2o_controller *);

extern int __init i2o_exec_init(void);
extern void __exit i2o_exec_exit(void);
extern void i2o_exec_exit(void);

/* driver */
extern struct bus_type i2o_bus_type;

extern int i2o_driver_dispatch(struct i2o_controller *, u32);

extern int __init i2o_driver_init(void);
extern void __exit i2o_driver_exit(void);
extern void i2o_driver_exit(void);

/* PCI */
extern int __init i2o_pci_init(void);
Expand Down
2 changes: 1 addition & 1 deletion drivers/message/i2o/driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ int __init i2o_driver_init(void)
*
* Unregisters the I2O bus and frees driver array.
*/
void __exit i2o_driver_exit(void)
void i2o_driver_exit(void)
{
bus_unregister(&i2o_bus_type);
kfree(i2o_drivers);
Expand Down
2 changes: 1 addition & 1 deletion drivers/message/i2o/exec-osm.c
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ int __init i2o_exec_init(void)
*
* Unregisters the Exec OSM from the I2O core.
*/
void __exit i2o_exec_exit(void)
void i2o_exec_exit(void)
{
i2o_driver_unregister(&i2o_exec_driver);
};
Expand Down

0 comments on commit d784372

Please sign in to comment.