* [PATCH] convert madgemc to initcalls
@ 2003-05-23 7:18 Christoph Hellwig
2003-05-23 7:50 ` David S. Miller
0 siblings, 1 reply; 2+ messages in thread
From: Christoph Hellwig @ 2003-05-23 7:18 UTC (permalink / raw)
To: netdev
This is a MCA driver so there should be no probe order issues.
--- 1.13/drivers/net/tokenring/madgemc.c Mon Apr 28 05:36:20 2003
+++ edited/drivers/net/tokenring/madgemc.c Thu May 22 11:22:50 2003
@@ -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");
--- 1.12/drivers/net/setup.c Thu May 22 10:08:06 2003
+++ edited/drivers/net/setup.c Thu May 22 11:21:55 2003
@@ -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},
};
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] convert madgemc to initcalls
2003-05-23 7:18 [PATCH] convert madgemc to initcalls Christoph Hellwig
@ 2003-05-23 7:50 ` David S. Miller
0 siblings, 0 replies; 2+ messages in thread
From: David S. Miller @ 2003-05-23 7:50 UTC (permalink / raw)
To: hch; +Cc: netdev
From: Christoph Hellwig <hch@lst.de>
Date: Fri, 23 May 2003 09:18:58 +0200
This is a MCA driver so there should be no probe order issues.
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2003-05-23 7:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-05-23 7:18 [PATCH] convert madgemc to initcalls Christoph Hellwig
2003-05-23 7:50 ` David S. Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).