Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7843724 authored by Ralf Baechle's avatar Ralf Baechle Committed by Linus Torvalds
Browse files

[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: default avatarRalf Baechle <ralf@linux-mips.org>
Cc: Markus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 39f07223

drivers/message/i2o/core.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ extern struct i2o_driver i2o_exec_driver; 
extern int i2o_exec_lct_get(struct i2o_controller *);

extern int i2o_exec_lct_get(struct i2o_controller *);





extern int __init i2o_exec_init(void);

extern int __init i2o_exec_init(void);

extern void __exit i2o_exec_exit(void);

extern void i2o_exec_exit(void);





/* driver */

/* driver */

extern struct bus_type i2o_bus_type;

extern struct bus_type i2o_bus_type;
@@ -26,7 +26,7 @@ extern struct bus_type i2o_bus_type; 
extern int i2o_driver_dispatch(struct i2o_controller *, u32);

extern int i2o_driver_dispatch(struct i2o_controller *, u32);





extern int __init i2o_driver_init(void);

extern int __init i2o_driver_init(void);

extern void __exit i2o_driver_exit(void);

extern void i2o_driver_exit(void);





/* PCI */

/* PCI */

extern int __init i2o_pci_init(void);

extern int __init i2o_pci_init(void);

drivers/message/i2o/driver.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -362,7 +362,7 @@ int __init i2o_driver_init(void) 
 *

 *

 *	Unregisters the I2O bus and frees driver array.

 *	Unregisters the I2O bus and frees driver array.

 */

 */

void __exit i2o_driver_exit(void)

void i2o_driver_exit(void)

{

{

	bus_unregister(&i2o_bus_type);

	bus_unregister(&i2o_bus_type);

	kfree(i2o_drivers);

	kfree(i2o_drivers);

drivers/message/i2o/exec-osm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -595,7 +595,7 @@ int __init i2o_exec_init(void) 
 *

 *

 *	Unregisters the Exec OSM from the I2O core.

 *	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);

	i2o_driver_unregister(&i2o_exec_driver);

};

};