Commit ab8e2eb7 authored by Rusty Russell's avatar Rusty Russell

cyber2000fb.c: use proper method for stopping unload if CONFIG_ARCH_SHARK

Russell explains the __module_get():
> cyber2000fb.c does it in its module initialization function
> to prevent the module (when built for Shark) from being unloaded.  It
> does this because it's from the days of 2.2 kernels and no one bothered
> writing the module unload support for Shark.

Since 2.4, the correct answer has been to not define an unload fn.

Cc: Russell King <rmk+lkml@arm.linux.org.uk>
Cc: alex@shark-linux.de
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 8ebf9756
...@@ -1736,10 +1736,8 @@ static int __init cyber2000fb_init(void) ...@@ -1736,10 +1736,8 @@ static int __init cyber2000fb_init(void)
#ifdef CONFIG_ARCH_SHARK #ifdef CONFIG_ARCH_SHARK
err = cyberpro_vl_probe(); err = cyberpro_vl_probe();
if (!err) { if (!err)
ret = 0; ret = 0;
__module_get(THIS_MODULE);
}
#endif #endif
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
err = pci_register_driver(&cyberpro_driver); err = pci_register_driver(&cyberpro_driver);
...@@ -1749,14 +1747,15 @@ static int __init cyber2000fb_init(void) ...@@ -1749,14 +1747,15 @@ static int __init cyber2000fb_init(void)
return ret ? err : 0; return ret ? err : 0;
} }
module_init(cyber2000fb_init);
#ifndef CONFIG_ARCH_SHARK
static void __exit cyberpro_exit(void) static void __exit cyberpro_exit(void)
{ {
pci_unregister_driver(&cyberpro_driver); pci_unregister_driver(&cyberpro_driver);
} }
module_init(cyber2000fb_init);
module_exit(cyberpro_exit); module_exit(cyberpro_exit);
#endif
MODULE_AUTHOR("Russell King"); MODULE_AUTHOR("Russell King");
MODULE_DESCRIPTION("CyberPro 2000, 2010 and 5000 framebuffer driver"); MODULE_DESCRIPTION("CyberPro 2000, 2010 and 5000 framebuffer driver");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment