diff options
author | Adrian Bunk <bunk@stusta.de> | 2007-01-02 03:35:48 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-01-03 21:38:10 -0500 |
commit | 60903f2c6616939afd0335b49697beeb7219657e (patch) | |
tree | 99825b33f85dbb00f649f9c6e863861a8368ef0e | |
parent | ee74baa7d83e9e0c2fdaff8122ee9cefd06cddc5 (diff) |
[NET] drivers/net/loopback.c: convert to module_init()
This patch converts drivers/net/loopback.c to using module_init().
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/Space.c | 11 | ||||
-rw-r--r-- | drivers/net/loopback.c | 4 |
2 files changed, 3 insertions, 12 deletions
diff --git a/drivers/net/Space.c b/drivers/net/Space.c index 602ed31a5dd9..9305eb9b1b98 100644 --- a/drivers/net/Space.c +++ b/drivers/net/Space.c | |||
@@ -349,22 +349,11 @@ static void __init trif_probe2(int unit) | |||
349 | #endif | 349 | #endif |
350 | 350 | ||
351 | 351 | ||
352 | /* | ||
353 | * The loopback device is global so it can be directly referenced | ||
354 | * by the network code. Also, it must be first on device list. | ||
355 | */ | ||
356 | extern int loopback_init(void); | ||
357 | |||
358 | /* Statically configured drivers -- order matters here. */ | 352 | /* Statically configured drivers -- order matters here. */ |
359 | static int __init net_olddevs_init(void) | 353 | static int __init net_olddevs_init(void) |
360 | { | 354 | { |
361 | int num; | 355 | int num; |
362 | 356 | ||
363 | if (loopback_init()) { | ||
364 | printk(KERN_ERR "Network loopback device setup failed\n"); | ||
365 | } | ||
366 | |||
367 | |||
368 | #ifdef CONFIG_SBNI | 357 | #ifdef CONFIG_SBNI |
369 | for (num = 0; num < 8; ++num) | 358 | for (num = 0; num < 8; ++num) |
370 | sbni_probe(num); | 359 | sbni_probe(num); |
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index 82c10dec1b5a..2b739fd584f1 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c | |||
@@ -229,9 +229,11 @@ struct net_device loopback_dev = { | |||
229 | }; | 229 | }; |
230 | 230 | ||
231 | /* Setup and register the loopback device. */ | 231 | /* Setup and register the loopback device. */ |
232 | int __init loopback_init(void) | 232 | static int __init loopback_init(void) |
233 | { | 233 | { |
234 | return register_netdev(&loopback_dev); | 234 | return register_netdev(&loopback_dev); |
235 | }; | 235 | }; |
236 | 236 | ||
237 | module_init(loopback_init); | ||
238 | |||
237 | EXPORT_SYMBOL(loopback_dev); | 239 | EXPORT_SYMBOL(loopback_dev); |