convert madgemc to initcalls
Subsystems (2)
PATCH 1/1 convert madgemc to initcalls
This is a MCA driver so there should be no probe order issues.
drivers/net/tokenring/madgemc.c +5 -17
@@ -63,7 +63,6 @@static struct madgemc_card *madgemc_card_list; -int madgemc_probe (void );static int madgemc_open (struct net_device *dev);static int madgemc_close (struct net_device *dev);static int madgemc_chipset_init (struct net_device *dev);
@@ -152,7 +151,7 @@ -int __init madgemc_probe (void ) +static int __init madgemc_probe (void ) {static int versionprinted;struct net_device *dev;
@@ -773,19 +772,7 @@return len; } -#ifdef MODULE - -int init_module (void ) -{ -/* Probe for cards. */ -if (madgemc_probe ()) { -printk (KERN_NOTICE "madgemc.c: No cards found.\n" ); - } -/* lock_tms380_module(); */ -return (0 ); -} - -void cleanup_module (void ) +static void __exit madgemc_exit(void) {struct net_device *dev;struct madgemc_card *this_card;
@@ -801,9 +788,10 @@ madgemc_card_list = this_card->next;kfree (this_card); } -/* unlock_tms380_module(); */ } -#endif /* MODULE */ + +module_init (madgemc_probe); +module_exit (madgemc_exit);MODULE_LICENSE ("GPL" );
drivers/net/setup.c +0 -10
@@ -17,8 +17,6 @@extern int sdla_c_setup (void );extern int lmc_setup (void ); -extern int madgemc_probe (void ); -/* * Devices in this list must do new style probing. That is they must * allocate their own device objects and do their own bus scans.
@@ -50,14 +48,6 @@ #if defined(CONFIG_LANMEDIA) {lmc_setup, 0}, #endif - -/* - * Token Ring Drivers - */ -#ifdef CONFIG_MADGEMC - {madgemc_probe, 0}, -#endif - {NULL, 0}, };
David S. Miller
Applied From: Christoph Hellwig <[email protected]>
Date: Fri, 23 May 2003 09:18:58 +0200
This is a MCA driver so there should be no probe order issues.
Applied, thanks.