kill drivers/net/setup.c
Subsystems (2)
PATCH 1/1 kill drivers/net/setup.c
The last two drivers are ppc 8xx system devices and Paul (ppc maintainer) said I should just send this patch along, the 8xx guys will have to deal with a possible breakage when brining up their port for 2.5/2.6 again. (Not that I expect anything bad to happen..)
arch/ppc/8260_io/enet.c +2 -1
@@ -608,7 +608,7 @@/* Initialize the CPM Ethernet on SCC. */ -int __init scc_enet_init (void ) +static int __init scc_enet_init (void ) {struct net_device *dev;struct scc_enet_private *cep;
@@ -860,3 +860,4 @@return 0 ; } +module_init (scc_enet_init);
arch/ppc/8260_io/fcc_enet.c +2 -1
@@ -1323,7 +1323,7 @@/* Initialize the CPM Ethernet on FCC. */ -int __init fec_enet_init (void ) +static int __init fec_enet_init (void ) {struct net_device *dev;struct fcc_enet_private *cep;
@@ -1394,6 +1394,7 @@return 0 ; } +module_init (fec_enet_init);/* Make sure the device is shut down during initialization. */
arch/ppc/8xx_io/enet.c +3 -1
@@ -639,7 +639,7 @@* transmit and receive to make sure we don't catch the CPM with some * inconsistent control information. */ -int __init scc_enet_init (void ) +static int __init scc_enet_init (void ) {struct net_device *dev;struct scc_enet_private *cep;
@@ -964,3 +964,5 @@return 0 ; } + +module_init (scc_enet_init);
arch/ppc/8xx_io/fec.c +2 -1
@@ -1566,7 +1566,7 @@/* Initialize the FEC Ethernet on 860T. */ -int __init fec_enet_init (void ) +static int __init fec_enet_init (void ) {struct net_device *dev;struct fec_enet_private *fep;
@@ -1782,6 +1782,7 @@return 0 ; } +module_init (fec_enet_init);/* This function is called to start or restart the FEC during a link * change. This only happens when switching between half and full
drivers/net/setup.c +0 -54
54 lines not on this page · raw message
net/core/dev.c +2 -10
@@ -2861,15 +2861,8 @@* unhooks any devices that fail to initialise (normally hardware not * present) and leaves us with a valid list of present and active devices. * -*/ - -extern void net_device_init (void ); -extern void ip_auto_config (void ); - - -/* -* This is called single threaded during boot, so no need -* to take the rtnl semaphore. +* This is called single threaded during boot, so no need +* to take the rtnl semaphore. */ static int __init net_dev_init (void ) {
@@ -3003,7 +2996,6 @@* Initialise network devices */ -net_device_init (); rc =0 ; out:return rc;