Fix USB Mon breakage
PATCH 1/1 Fix USB Mon breakage
Never call __exit code from __init code - it causes errors such as:
arm-linux-ld: mon_bin_exit' referenced in section .init.text' of drivers/built-in.o: defined in discarded section `.exit.text' of drivers/built-in.o
arm-linux-ld: mon_text_exit' referenced in section .init.text' of drivers/built-in.o: defined in discarded section `.exit.text' of drivers/built-in.o
Signed-off-by Russell King <[email protected]>
--- drivers/usb/mon/mon_bin.c | 2 +- drivers/usb/mon/mon_text.c | 2 +- drivers/usb/mon/usb_mon.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/usb/mon/mon_bin.c +1 -1
@@ -1165,7 +1165,7 @@ err_dev:return rc; } -void __exit mon_bin_exit(void) +void mon_bin_exit (void ) {cdev_del (&mon_bin_cdev);unregister_chrdev_region (mon_bin_dev0,MON_BIN_MAX_MINOR );
drivers/usb/mon/mon_text.c +1 -1
@@ -520,7 +520,7 @@ int __init mon_text_init(void)return 0 ; } -void __exit mon_text_exit(void) +void mon_text_exit (void ) {debugfs_remove (mon_dir); }
drivers/usb/mon/usb_mon.h +2 -2
@@ -57,9 +57,9 @@ void mon_text_del(struct mon_bus *mbus);// void mon_bin_add(struct mon_bus *); int __init mon_text_init (void ); -void __exit mon_text_exit(void); +void mon_text_exit (void );int __init mon_bin_init (void ); -void __exit mon_bin_exit(void); +void mon_bin_exit (void );/* * DMA interface.
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of:
Quoted 1 line · Russell King
Never call
__exitcode from__initcode - it causes errors such as:
Oh heh, just saw this now.
Quoted 1 line
Signed-off-by Russell King <[email protected]>
I ack this. Greg, please either apply Dobriyan's patch, or this one, they are the same.
-- Pete