aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/3c59x.c2
-rw-r--r--drivers/net/8139cp.c2
-rw-r--r--drivers/net/8139too.c2
-rw-r--r--drivers/net/acenic.c2
-rw-r--r--drivers/net/amd8111e.c2
-rw-r--r--drivers/net/arcnet/com20020-pci.c2
-rw-r--r--drivers/net/b44.c2
-rw-r--r--drivers/net/bnx2.c2
-rw-r--r--drivers/net/cassini.c2
-rw-r--r--drivers/net/chelsio/cxgb2.c2
-rw-r--r--drivers/net/defxx.c2
-rw-r--r--drivers/net/dl2k.c2
-rw-r--r--drivers/net/e100.c2
-rw-r--r--drivers/net/e1000/e1000_main.c2
-rw-r--r--drivers/net/eepro100.c2
-rw-r--r--drivers/net/epic100.c2
-rw-r--r--drivers/net/fealnx.c2
-rw-r--r--drivers/net/forcedeth.c2
-rw-r--r--drivers/net/ixgb/ixgb_main.c2
-rw-r--r--drivers/net/natsemi.c2
-rw-r--r--drivers/net/ne2k-pci.c2
-rw-r--r--drivers/net/ns83820.c2
-rw-r--r--drivers/net/pci-skeleton.c2
-rw-r--r--drivers/net/pcnet32.c2
-rw-r--r--drivers/net/r8169.c2
-rw-r--r--drivers/net/rrunner.c2
-rw-r--r--drivers/net/s2io.c2
-rw-r--r--drivers/net/saa9730.c2
-rw-r--r--drivers/net/sis190.c2
-rw-r--r--drivers/net/sis900.c2
-rw-r--r--drivers/net/sk98lin/skge.c2
-rw-r--r--drivers/net/skfp/skfddi.c2
-rw-r--r--drivers/net/skge.c2
-rw-r--r--drivers/net/starfire.c2
-rw-r--r--drivers/net/sundance.c2
-rw-r--r--drivers/net/sungem.c2
-rw-r--r--drivers/net/tc35815.c2
-rw-r--r--drivers/net/tg3.c2
-rw-r--r--drivers/net/tokenring/3c359.c2
-rw-r--r--drivers/net/tokenring/lanstreamer.c2
-rw-r--r--drivers/net/tulip/de2104x.c2
-rw-r--r--drivers/net/tulip/de4x5.c2
-rw-r--r--drivers/net/tulip/dmfe.c2
-rw-r--r--drivers/net/tulip/tulip_core.c2
-rw-r--r--drivers/net/tulip/winbond-840.c2
-rw-r--r--drivers/net/tulip/xircom_tulip_cb.c2
-rw-r--r--drivers/net/typhoon.c2
-rw-r--r--drivers/net/via-rhine.c2
-rw-r--r--drivers/net/via-velocity.c2
-rw-r--r--drivers/net/wan/dscc4.c2
-rw-r--r--drivers/net/wan/farsync.c2
-rw-r--r--drivers/net/wan/lmc/lmc_main.c2
-rw-r--r--drivers/net/wan/pc300_drv.c2
-rw-r--r--drivers/net/wan/pci200syn.c2
-rw-r--r--drivers/net/wan/wanxl.c2
-rw-r--r--drivers/net/wireless/atmel_pci.c2
-rw-r--r--drivers/net/wireless/ipw2100.c2
-rw-r--r--drivers/net/wireless/ipw2200.c2
-rw-r--r--drivers/net/wireless/orinoco_nortel.c2
-rw-r--r--drivers/net/wireless/orinoco_pci.c2
-rw-r--r--drivers/net/wireless/orinoco_plx.c2
-rw-r--r--drivers/net/wireless/orinoco_tmd.c2
-rw-r--r--drivers/net/wireless/prism54/islpci_hotplug.c2
-rw-r--r--drivers/net/yellowfin.c2
64 files changed, 64 insertions, 64 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 80e8ca013e44..7c23813bb097 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -3169,7 +3169,7 @@ static int __init vortex_init(void)
3169{ 3169{
3170 int pci_rc, eisa_rc; 3170 int pci_rc, eisa_rc;
3171 3171
3172 pci_rc = pci_module_init(&vortex_driver); 3172 pci_rc = pci_register_driver(&vortex_driver);
3173 eisa_rc = vortex_eisa_init(); 3173 eisa_rc = vortex_eisa_init();
3174 3174
3175 if (pci_rc == 0) 3175 if (pci_rc == 0)
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 1428bb7715af..4c2e76326c4a 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -2098,7 +2098,7 @@ static int __init cp_init (void)
2098#ifdef MODULE 2098#ifdef MODULE
2099 printk("%s", version); 2099 printk("%s", version);
2100#endif 2100#endif
2101 return pci_module_init (&cp_driver); 2101 return pci_register_driver(&cp_driver);
2102} 2102}
2103 2103
2104static void __exit cp_exit (void) 2104static void __exit cp_exit (void)
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index e4f4eaff7679..2a707747ed8e 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -2629,7 +2629,7 @@ static int __init rtl8139_init_module (void)
2629 printk (KERN_INFO RTL8139_DRIVER_NAME "\n"); 2629 printk (KERN_INFO RTL8139_DRIVER_NAME "\n");
2630#endif 2630#endif
2631 2631
2632 return pci_module_init (&rtl8139_pci_driver); 2632 return pci_register_driver(&rtl8139_pci_driver);
2633} 2633}
2634 2634
2635 2635
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 1c01e9b3d07c..c0f3574b470b 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -725,7 +725,7 @@ static struct pci_driver acenic_pci_driver = {
725 725
726static int __init acenic_init(void) 726static int __init acenic_init(void)
727{ 727{
728 return pci_module_init(&acenic_pci_driver); 728 return pci_register_driver(&acenic_pci_driver);
729} 729}
730 730
731static void __exit acenic_exit(void) 731static void __exit acenic_exit(void)
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index ed322a76980d..2ef8e554263b 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -2158,7 +2158,7 @@ static struct pci_driver amd8111e_driver = {
2158 2158
2159static int __init amd8111e_init(void) 2159static int __init amd8111e_init(void)
2160{ 2160{
2161 return pci_module_init(&amd8111e_driver); 2161 return pci_register_driver(&amd8111e_driver);
2162} 2162}
2163 2163
2164static void __exit amd8111e_cleanup(void) 2164static void __exit amd8111e_cleanup(void)
diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c
index 979a33df0a8c..fc256c197cd6 100644
--- a/drivers/net/arcnet/com20020-pci.c
+++ b/drivers/net/arcnet/com20020-pci.c
@@ -177,7 +177,7 @@ static struct pci_driver com20020pci_driver = {
177static int __init com20020pci_init(void) 177static int __init com20020pci_init(void)
178{ 178{
179 BUGLVL(D_NORMAL) printk(VERSION); 179 BUGLVL(D_NORMAL) printk(VERSION);
180 return pci_module_init(&com20020pci_driver); 180 return pci_register_driver(&com20020pci_driver);
181} 181}
182 182
183static void __exit com20020pci_cleanup(void) 183static void __exit com20020pci_cleanup(void)
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index bea0fc0ede2f..17eb2912971d 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -2354,7 +2354,7 @@ static int __init b44_init(void)
2354 dma_desc_align_mask = ~(dma_desc_align_size - 1); 2354 dma_desc_align_mask = ~(dma_desc_align_size - 1);
2355 dma_desc_sync_size = max_t(unsigned int, dma_desc_align_size, sizeof(struct dma_desc)); 2355 dma_desc_sync_size = max_t(unsigned int, dma_desc_align_size, sizeof(struct dma_desc));
2356 2356
2357 return pci_module_init(&b44_driver); 2357 return pci_register_driver(&b44_driver);
2358} 2358}
2359 2359
2360static void __exit b44_cleanup(void) 2360static void __exit b44_cleanup(void)
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 652eb05a6c2d..654b903985cd 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -6016,7 +6016,7 @@ static struct pci_driver bnx2_pci_driver = {
6016 6016
6017static int __init bnx2_init(void) 6017static int __init bnx2_init(void)
6018{ 6018{
6019 return pci_module_init(&bnx2_pci_driver); 6019 return pci_register_driver(&bnx2_pci_driver);
6020} 6020}
6021 6021
6022static void __exit bnx2_cleanup(void) 6022static void __exit bnx2_cleanup(void)
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index a31544ccb3c4..26040abfef62 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -5245,7 +5245,7 @@ static int __init cas_init(void)
5245 else 5245 else
5246 link_transition_timeout = 0; 5246 link_transition_timeout = 0;
5247 5247
5248 return pci_module_init(&cas_driver); 5248 return pci_register_driver(&cas_driver);
5249} 5249}
5250 5250
5251static void __exit cas_cleanup(void) 5251static void __exit cas_cleanup(void)
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c
index e67872433e92..b6de184e4699 100644
--- a/drivers/net/chelsio/cxgb2.c
+++ b/drivers/net/chelsio/cxgb2.c
@@ -1243,7 +1243,7 @@ static struct pci_driver driver = {
1243 1243
1244static int __init t1_init_module(void) 1244static int __init t1_init_module(void)
1245{ 1245{
1246 return pci_module_init(&driver); 1246 return pci_register_driver(&driver);
1247} 1247}
1248 1248
1249static void __exit t1_cleanup_module(void) 1249static void __exit t1_cleanup_module(void)
diff --git a/drivers/net/defxx.c b/drivers/net/defxx.c
index 91cc8cbdd440..7d06dedbfb26 100644
--- a/drivers/net/defxx.c
+++ b/drivers/net/defxx.c
@@ -3444,7 +3444,7 @@ static int __init dfx_init(void)
3444{ 3444{
3445 int rc_pci, rc_eisa; 3445 int rc_pci, rc_eisa;
3446 3446
3447 rc_pci = pci_module_init(&dfx_driver); 3447 rc_pci = pci_register_driver(&dfx_driver);
3448 if (rc_pci >= 0) dfx_have_pci = 1; 3448 if (rc_pci >= 0) dfx_have_pci = 1;
3449 3449
3450 rc_eisa = dfx_eisa_init(); 3450 rc_eisa = dfx_eisa_init();
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c
index 402961e68c89..a572c2970564 100644
--- a/drivers/net/dl2k.c
+++ b/drivers/net/dl2k.c
@@ -1815,7 +1815,7 @@ static struct pci_driver rio_driver = {
1815static int __init 1815static int __init
1816rio_init (void) 1816rio_init (void)
1817{ 1817{
1818 return pci_module_init (&rio_driver); 1818 return pci_register_driver(&rio_driver);
1819} 1819}
1820 1820
1821static void __exit 1821static void __exit
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 91ef5f2fd768..5f68cb8eb336 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2873,7 +2873,7 @@ static int __init e100_init_module(void)
2873 printk(KERN_INFO PFX "%s, %s\n", DRV_DESCRIPTION, DRV_VERSION); 2873 printk(KERN_INFO PFX "%s, %s\n", DRV_DESCRIPTION, DRV_VERSION);
2874 printk(KERN_INFO PFX "%s\n", DRV_COPYRIGHT); 2874 printk(KERN_INFO PFX "%s\n", DRV_COPYRIGHT);
2875 } 2875 }
2876 return pci_module_init(&e100_driver); 2876 return pci_register_driver(&e100_driver);
2877} 2877}
2878 2878
2879static void __exit e100_cleanup_module(void) 2879static void __exit e100_cleanup_module(void)
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 726f43d55937..336435d81eca 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -245,7 +245,7 @@ e1000_init_module(void)
245 245
246 printk(KERN_INFO "%s\n", e1000_copyright); 246 printk(KERN_INFO "%s\n", e1000_copyright);
247 247
248 ret = pci_module_init(&e1000_driver); 248 ret = pci_register_driver(&e1000_driver);
249 249
250 return ret; 250 return ret;
251} 251}
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index e445988c92ee..a3d515def109 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -2385,7 +2385,7 @@ static int __init eepro100_init_module(void)
2385#ifdef MODULE 2385#ifdef MODULE
2386 printk(version); 2386 printk(version);
2387#endif 2387#endif
2388 return pci_module_init(&eepro100_driver); 2388 return pci_register_driver(&eepro100_driver);
2389} 2389}
2390 2390
2391static void __exit eepro100_cleanup_module(void) 2391static void __exit eepro100_cleanup_module(void)
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index a67650ccf084..25c4619d842e 100644
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -1604,7 +1604,7 @@ static int __init epic_init (void)
1604 version, version2, version3); 1604 version, version2, version3);
1605#endif 1605#endif
1606 1606
1607 return pci_module_init (&epic_driver); 1607 return pci_register_driver(&epic_driver);
1608} 1608}
1609 1609
1610 1610
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
index 567e27413cfd..a2121faa610f 100644
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
@@ -1984,7 +1984,7 @@ static int __init fealnx_init(void)
1984 printk(version); 1984 printk(version);
1985#endif 1985#endif
1986 1986
1987 return pci_module_init(&fealnx_driver); 1987 return pci_register_driver(&fealnx_driver);
1988} 1988}
1989 1989
1990static void __exit fealnx_exit(void) 1990static void __exit fealnx_exit(void)
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index a2aca92e8b2a..8c8f7cf0e952 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -4667,7 +4667,7 @@ static struct pci_driver driver = {
4667static int __init init_nic(void) 4667static int __init init_nic(void)
4668{ 4668{
4669 printk(KERN_INFO "forcedeth.c: Reverse Engineered nForce ethernet driver. Version %s.\n", FORCEDETH_VERSION); 4669 printk(KERN_INFO "forcedeth.c: Reverse Engineered nForce ethernet driver. Version %s.\n", FORCEDETH_VERSION);
4670 return pci_module_init(&driver); 4670 return pci_register_driver(&driver);
4671} 4671}
4672 4672
4673static void __exit exit_nic(void) 4673static void __exit exit_nic(void)
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 7bbd447289b5..5bff05f9757b 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -162,7 +162,7 @@ ixgb_init_module(void)
162 162
163 printk(KERN_INFO "%s\n", ixgb_copyright); 163 printk(KERN_INFO "%s\n", ixgb_copyright);
164 164
165 return pci_module_init(&ixgb_driver); 165 return pci_register_driver(&ixgb_driver);
166} 166}
167 167
168module_init(ixgb_init_module); 168module_init(ixgb_init_module);
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index db0475a1102f..9510030feeb4 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -3246,7 +3246,7 @@ static int __init natsemi_init_mod (void)
3246 printk(version); 3246 printk(version);
3247#endif 3247#endif
3248 3248
3249 return pci_module_init (&natsemi_driver); 3249 return pci_register_driver(&natsemi_driver);
3250} 3250}
3251 3251
3252static void __exit natsemi_exit_mod (void) 3252static void __exit natsemi_exit_mod (void)
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c
index 34bdba9eec79..654b477b570a 100644
--- a/drivers/net/ne2k-pci.c
+++ b/drivers/net/ne2k-pci.c
@@ -702,7 +702,7 @@ static int __init ne2k_pci_init(void)
702#ifdef MODULE 702#ifdef MODULE
703 printk(version); 703 printk(version);
704#endif 704#endif
705 return pci_module_init (&ne2k_driver); 705 return pci_register_driver(&ne2k_driver);
706} 706}
707 707
708 708
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 0e76859c90a2..0dedd34804c3 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -2178,7 +2178,7 @@ static struct pci_driver driver = {
2178static int __init ns83820_init(void) 2178static int __init ns83820_init(void)
2179{ 2179{
2180 printk(KERN_INFO "ns83820.c: National Semiconductor DP83820 10/100/1000 driver.\n"); 2180 printk(KERN_INFO "ns83820.c: National Semiconductor DP83820 10/100/1000 driver.\n");
2181 return pci_module_init(&driver); 2181 return pci_register_driver(&driver);
2182} 2182}
2183 2183
2184static void __exit ns83820_exit(void) 2184static void __exit ns83820_exit(void)
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c
index e0e293964042..e6347620529e 100644
--- a/drivers/net/pci-skeleton.c
+++ b/drivers/net/pci-skeleton.c
@@ -1963,7 +1963,7 @@ static int __init netdrv_init_module (void)
1963#ifdef MODULE 1963#ifdef MODULE
1964 printk(version); 1964 printk(version);
1965#endif 1965#endif
1966 return pci_module_init (&netdrv_pci_driver); 1966 return pci_register_driver(&netdrv_pci_driver);
1967} 1967}
1968 1968
1969 1969
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index 4daafe303358..ba6065768eb2 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -2969,7 +2969,7 @@ static int __init pcnet32_init_module(void)
2969 tx_start = tx_start_pt; 2969 tx_start = tx_start_pt;
2970 2970
2971 /* find the PCI devices */ 2971 /* find the PCI devices */
2972 if (!pci_module_init(&pcnet32_driver)) 2972 if (!pci_register_driver(&pcnet32_driver))
2973 pcnet32_have_pci = 1; 2973 pcnet32_have_pci = 1;
2974 2974
2975 /* should we find any remaining VLbus devices ? */ 2975 /* should we find any remaining VLbus devices ? */
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 4c2f575faad7..5722a5638ffc 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2809,7 +2809,7 @@ static struct pci_driver rtl8169_pci_driver = {
2809static int __init 2809static int __init
2810rtl8169_init_module(void) 2810rtl8169_init_module(void)
2811{ 2811{
2812 return pci_module_init(&rtl8169_pci_driver); 2812 return pci_register_driver(&rtl8169_pci_driver);
2813} 2813}
2814 2814
2815static void __exit 2815static void __exit
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c
index c3ed734cbe39..31bcdad54716 100644
--- a/drivers/net/rrunner.c
+++ b/drivers/net/rrunner.c
@@ -1736,7 +1736,7 @@ static struct pci_driver rr_driver = {
1736 1736
1737static int __init rr_init_module(void) 1737static int __init rr_init_module(void)
1738{ 1738{
1739 return pci_module_init(&rr_driver); 1739 return pci_register_driver(&rr_driver);
1740} 1740}
1741 1741
1742static void __exit rr_cleanup_module(void) 1742static void __exit rr_cleanup_module(void)
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index e72e0e099060..c16f9156c98a 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -7233,7 +7233,7 @@ static void __devexit s2io_rem_nic(struct pci_dev *pdev)
7233 7233
7234int __init s2io_starter(void) 7234int __init s2io_starter(void)
7235{ 7235{
7236 return pci_module_init(&s2io_driver); 7236 return pci_register_driver(&s2io_driver);
7237} 7237}
7238 7238
7239/** 7239/**
diff --git a/drivers/net/saa9730.c b/drivers/net/saa9730.c
index b2acedbefa8f..c479b07be788 100644
--- a/drivers/net/saa9730.c
+++ b/drivers/net/saa9730.c
@@ -1131,7 +1131,7 @@ static struct pci_driver saa9730_driver = {
1131 1131
1132static int __init saa9730_init(void) 1132static int __init saa9730_init(void)
1133{ 1133{
1134 return pci_module_init(&saa9730_driver); 1134 return pci_register_driver(&saa9730_driver);
1135} 1135}
1136 1136
1137static void __exit saa9730_cleanup(void) 1137static void __exit saa9730_cleanup(void)
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index df0cbebb3277..16e30d523fc5 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -1871,7 +1871,7 @@ static struct pci_driver sis190_pci_driver = {
1871 1871
1872static int __init sis190_init_module(void) 1872static int __init sis190_init_module(void)
1873{ 1873{
1874 return pci_module_init(&sis190_pci_driver); 1874 return pci_register_driver(&sis190_pci_driver);
1875} 1875}
1876 1876
1877static void __exit sis190_cleanup_module(void) 1877static void __exit sis190_cleanup_module(void)
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index b19f3abd3dc9..6af50286349d 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -2496,7 +2496,7 @@ static int __init sis900_init_module(void)
2496 printk(version); 2496 printk(version);
2497#endif 2497#endif
2498 2498
2499 return pci_module_init(&sis900_pci_driver); 2499 return pci_register_driver(&sis900_pci_driver);
2500} 2500}
2501 2501
2502static void __exit sis900_cleanup_module(void) 2502static void __exit sis900_cleanup_module(void)
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
index ee62845d3ac9..49e76c7f10da 100644
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@ -5133,7 +5133,7 @@ static struct pci_driver skge_driver = {
5133 5133
5134static int __init skge_init(void) 5134static int __init skge_init(void)
5135{ 5135{
5136 return pci_module_init(&skge_driver); 5136 return pci_register_driver(&skge_driver);
5137} 5137}
5138 5138
5139static void __exit skge_exit(void) 5139static void __exit skge_exit(void)
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c
index b5714a60237d..8e4d18440a56 100644
--- a/drivers/net/skfp/skfddi.c
+++ b/drivers/net/skfp/skfddi.c
@@ -2280,7 +2280,7 @@ static struct pci_driver skfddi_pci_driver = {
2280 2280
2281static int __init skfd_init(void) 2281static int __init skfd_init(void)
2282{ 2282{
2283 return pci_module_init(&skfddi_pci_driver); 2283 return pci_register_driver(&skfddi_pci_driver);
2284} 2284}
2285 2285
2286static void __exit skfd_exit(void) 2286static void __exit skfd_exit(void)
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index ad878dfddef4..1b752141a4f3 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -3510,7 +3510,7 @@ static struct pci_driver skge_driver = {
3510 3510
3511static int __init skge_init_module(void) 3511static int __init skge_init_module(void)
3512{ 3512{
3513 return pci_module_init(&skge_driver); 3513 return pci_register_driver(&skge_driver);
3514} 3514}
3515 3515
3516static void __exit skge_cleanup_module(void) 3516static void __exit skge_cleanup_module(void)
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index c0a62b00ffc8..8e1f6206b7d0 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -2053,7 +2053,7 @@ static int __init starfire_init (void)
2053 return -ENODEV; 2053 return -ENODEV;
2054 } 2054 }
2055 2055
2056 return pci_module_init (&starfire_driver); 2056 return pci_register_driver(&starfire_driver);
2057} 2057}
2058 2058
2059 2059
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index 90ac216d6dd5..c243a80f4006 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -1733,7 +1733,7 @@ static int __init sundance_init(void)
1733#ifdef MODULE 1733#ifdef MODULE
1734 printk(version); 1734 printk(version);
1735#endif 1735#endif
1736 return pci_module_init(&sundance_driver); 1736 return pci_register_driver(&sundance_driver);
1737} 1737}
1738 1738
1739static void __exit sundance_exit(void) 1739static void __exit sundance_exit(void)
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index b70bbd748978..1a441a8a2add 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -3194,7 +3194,7 @@ static struct pci_driver gem_driver = {
3194 3194
3195static int __init gem_init(void) 3195static int __init gem_init(void)
3196{ 3196{
3197 return pci_module_init(&gem_driver); 3197 return pci_register_driver(&gem_driver);
3198} 3198}
3199 3199
3200static void __exit gem_cleanup(void) 3200static void __exit gem_cleanup(void)
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index 8b53ded66d37..39460fa916fe 100644
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -1725,7 +1725,7 @@ static struct pci_driver tc35815_driver = {
1725 1725
1726static int __init tc35815_init_module(void) 1726static int __init tc35815_init_module(void)
1727{ 1727{
1728 return pci_module_init(&tc35815_driver); 1728 return pci_register_driver(&tc35815_driver);
1729} 1729}
1730 1730
1731static void __exit tc35815_cleanup_module(void) 1731static void __exit tc35815_cleanup_module(void)
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index eafabb253f08..d6e2a6869f28 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -11819,7 +11819,7 @@ static struct pci_driver tg3_driver = {
11819 11819
11820static int __init tg3_init(void) 11820static int __init tg3_init(void)
11821{ 11821{
11822 return pci_module_init(&tg3_driver); 11822 return pci_register_driver(&tg3_driver);
11823} 11823}
11824 11824
11825static void __exit tg3_cleanup(void) 11825static void __exit tg3_cleanup(void)
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index 465921e3874c..412390ba142e 100644
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -1815,7 +1815,7 @@ static struct pci_driver xl_3c359_driver = {
1815 1815
1816static int __init xl_pci_init (void) 1816static int __init xl_pci_init (void)
1817{ 1817{
1818 return pci_module_init (&xl_3c359_driver); 1818 return pci_register_driver(&xl_3c359_driver);
1819} 1819}
1820 1820
1821 1821
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index 28d968ffd5d0..0d66700c6ced 100644
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -1998,7 +1998,7 @@ static struct pci_driver streamer_pci_driver = {
1998}; 1998};
1999 1999
2000static int __init streamer_init_module(void) { 2000static int __init streamer_init_module(void) {
2001 return pci_module_init(&streamer_pci_driver); 2001 return pci_register_driver(&streamer_pci_driver);
2002} 2002}
2003 2003
2004static void __exit streamer_cleanup_module(void) { 2004static void __exit streamer_cleanup_module(void) {
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index d05c5aa254ee..350a73e99a85 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -2172,7 +2172,7 @@ static int __init de_init (void)
2172#ifdef MODULE 2172#ifdef MODULE
2173 printk("%s", version); 2173 printk("%s", version);
2174#endif 2174#endif
2175 return pci_module_init (&de_driver); 2175 return pci_register_driver(&de_driver);
2176} 2176}
2177 2177
2178static void __exit de_exit (void) 2178static void __exit de_exit (void)
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index 75ff14a55239..e661d0a9cc64 100644
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -5754,7 +5754,7 @@ static int __init de4x5_module_init (void)
5754 int err = 0; 5754 int err = 0;
5755 5755
5756#ifdef CONFIG_PCI 5756#ifdef CONFIG_PCI
5757 err = pci_module_init (&de4x5_pci_driver); 5757 err = pci_register_driver(&de4x5_pci_driver);
5758#endif 5758#endif
5759#ifdef CONFIG_EISA 5759#ifdef CONFIG_EISA
5760 err |= eisa_driver_register (&de4x5_eisa_driver); 5760 err |= eisa_driver_register (&de4x5_eisa_driver);
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index 4e5b0f2acc39..66dade556821 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -2039,7 +2039,7 @@ static int __init dmfe_init_module(void)
2039 if (HPNA_NoiseFloor > 15) 2039 if (HPNA_NoiseFloor > 15)
2040 HPNA_NoiseFloor = 0; 2040 HPNA_NoiseFloor = 0;
2041 2041
2042 rc = pci_module_init(&dmfe_driver); 2042 rc = pci_register_driver(&dmfe_driver);
2043 if (rc < 0) 2043 if (rc < 0)
2044 return rc; 2044 return rc;
2045 2045
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 7351831f57ce..e1987ec493c2 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -1849,7 +1849,7 @@ static int __init tulip_init (void)
1849 tulip_max_interrupt_work = max_interrupt_work; 1849 tulip_max_interrupt_work = max_interrupt_work;
1850 1850
1851 /* probe for and init boards */ 1851 /* probe for and init boards */
1852 return pci_module_init (&tulip_driver); 1852 return pci_register_driver(&tulip_driver);
1853} 1853}
1854 1854
1855 1855
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index eba9083da146..6b82d1498223 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -1689,7 +1689,7 @@ static struct pci_driver w840_driver = {
1689static int __init w840_init(void) 1689static int __init w840_init(void)
1690{ 1690{
1691 printk(version); 1691 printk(version);
1692 return pci_module_init(&w840_driver); 1692 return pci_register_driver(&w840_driver);
1693} 1693}
1694 1694
1695static void __exit w840_exit(void) 1695static void __exit w840_exit(void)
diff --git a/drivers/net/tulip/xircom_tulip_cb.c b/drivers/net/tulip/xircom_tulip_cb.c
index 17ca7dc42e6f..d797b7b2e35f 100644
--- a/drivers/net/tulip/xircom_tulip_cb.c
+++ b/drivers/net/tulip/xircom_tulip_cb.c
@@ -1707,7 +1707,7 @@ static int __init xircom_init(void)
1707#ifdef MODULE 1707#ifdef MODULE
1708 printk(version); 1708 printk(version);
1709#endif 1709#endif
1710 return pci_module_init(&xircom_driver); 1710 return pci_register_driver(&xircom_driver);
1711} 1711}
1712 1712
1713 1713
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 4103c37172f9..1014461178cc 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -2660,7 +2660,7 @@ static struct pci_driver typhoon_driver = {
2660static int __init 2660static int __init
2661typhoon_init(void) 2661typhoon_init(void)
2662{ 2662{
2663 return pci_module_init(&typhoon_driver); 2663 return pci_register_driver(&typhoon_driver);
2664} 2664}
2665 2665
2666static void __exit 2666static void __exit
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index ae971080e2e4..efeb10b9c61b 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -2005,7 +2005,7 @@ static int __init rhine_init(void)
2005#ifdef MODULE 2005#ifdef MODULE
2006 printk(version); 2006 printk(version);
2007#endif 2007#endif
2008 return pci_module_init(&rhine_driver); 2008 return pci_register_driver(&rhine_driver);
2009} 2009}
2010 2010
2011 2011
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index aa9cd92f46b2..e266db1518e7 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -2250,7 +2250,7 @@ static int __init velocity_init_module(void)
2250 int ret; 2250 int ret;
2251 2251
2252 velocity_register_notifier(); 2252 velocity_register_notifier();
2253 ret = pci_module_init(&velocity_driver); 2253 ret = pci_register_driver(&velocity_driver);
2254 if (ret < 0) 2254 if (ret < 0)
2255 velocity_unregister_notifier(); 2255 velocity_unregister_notifier();
2256 return ret; 2256 return ret;
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 684af4316ffd..af4d4155905b 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -2062,7 +2062,7 @@ static struct pci_driver dscc4_driver = {
2062 2062
2063static int __init dscc4_init_module(void) 2063static int __init dscc4_init_module(void)
2064{ 2064{
2065 return pci_module_init(&dscc4_driver); 2065 return pci_register_driver(&dscc4_driver);
2066} 2066}
2067 2067
2068static void __exit dscc4_cleanup_module(void) 2068static void __exit dscc4_cleanup_module(void)
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index 3705db04a343..564351aafa41 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -2697,7 +2697,7 @@ fst_init(void)
2697 for (i = 0; i < FST_MAX_CARDS; i++) 2697 for (i = 0; i < FST_MAX_CARDS; i++)
2698 fst_card_array[i] = NULL; 2698 fst_card_array[i] = NULL;
2699 spin_lock_init(&fst_work_q_lock); 2699 spin_lock_init(&fst_work_q_lock);
2700 return pci_module_init(&fst_driver); 2700 return pci_register_driver(&fst_driver);
2701} 2701}
2702 2702
2703static void __exit 2703static void __exit
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index 39f44241a728..7b5d81deb028 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -1790,7 +1790,7 @@ static struct pci_driver lmc_driver = {
1790 1790
1791static int __init init_lmc(void) 1791static int __init init_lmc(void)
1792{ 1792{
1793 return pci_module_init(&lmc_driver); 1793 return pci_register_driver(&lmc_driver);
1794} 1794}
1795 1795
1796static void __exit exit_lmc(void) 1796static void __exit exit_lmc(void)
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c
index 567effff4a3e..56e69403d178 100644
--- a/drivers/net/wan/pc300_drv.c
+++ b/drivers/net/wan/pc300_drv.c
@@ -3677,7 +3677,7 @@ static struct pci_driver cpc_driver = {
3677 3677
3678static int __init cpc_init(void) 3678static int __init cpc_init(void)
3679{ 3679{
3680 return pci_module_init(&cpc_driver); 3680 return pci_register_driver(&cpc_driver);
3681} 3681}
3682 3682
3683static void __exit cpc_cleanup_module(void) 3683static void __exit cpc_cleanup_module(void)
diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c
index 4df61fa3214b..a6b9c33b68e4 100644
--- a/drivers/net/wan/pci200syn.c
+++ b/drivers/net/wan/pci200syn.c
@@ -476,7 +476,7 @@ static int __init pci200_init_module(void)
476 printk(KERN_ERR "pci200syn: Invalid PCI clock frequency\n"); 476 printk(KERN_ERR "pci200syn: Invalid PCI clock frequency\n");
477 return -EINVAL; 477 return -EINVAL;
478 } 478 }
479 return pci_module_init(&pci200_pci_driver); 479 return pci_register_driver(&pci200_pci_driver);
480} 480}
481 481
482 482
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index b2031dfc4bb1..ec68f7dfd93f 100644
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -837,7 +837,7 @@ static int __init wanxl_init_module(void)
837#ifdef MODULE 837#ifdef MODULE
838 printk(KERN_INFO "%s\n", version); 838 printk(KERN_INFO "%s\n", version);
839#endif 839#endif
840 return pci_module_init(&wanxl_pci_driver); 840 return pci_register_driver(&wanxl_pci_driver);
841} 841}
842 842
843static void __exit wanxl_cleanup_module(void) 843static void __exit wanxl_cleanup_module(void)
diff --git a/drivers/net/wireless/atmel_pci.c b/drivers/net/wireless/atmel_pci.c
index d425c3cefded..3bfa791c323d 100644
--- a/drivers/net/wireless/atmel_pci.c
+++ b/drivers/net/wireless/atmel_pci.c
@@ -76,7 +76,7 @@ static void __devexit atmel_pci_remove(struct pci_dev *pdev)
76 76
77static int __init atmel_init_module(void) 77static int __init atmel_init_module(void)
78{ 78{
79 return pci_module_init(&atmel_driver); 79 return pci_register_driver(&atmel_driver);
80} 80}
81 81
82static void __exit atmel_cleanup_module(void) 82static void __exit atmel_cleanup_module(void)
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index e955db435b30..5f8ccf48061a 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -6531,7 +6531,7 @@ static int __init ipw2100_init(void)
6531 printk(KERN_INFO DRV_NAME ": %s, %s\n", DRV_DESCRIPTION, DRV_VERSION); 6531 printk(KERN_INFO DRV_NAME ": %s, %s\n", DRV_DESCRIPTION, DRV_VERSION);
6532 printk(KERN_INFO DRV_NAME ": %s\n", DRV_COPYRIGHT); 6532 printk(KERN_INFO DRV_NAME ": %s\n", DRV_COPYRIGHT);
6533 6533
6534 ret = pci_module_init(&ipw2100_pci_driver); 6534 ret = pci_register_driver(&ipw2100_pci_driver);
6535 6535
6536#ifdef CONFIG_IPW2100_DEBUG 6536#ifdef CONFIG_IPW2100_DEBUG
6537 ipw2100_debug_level = debug; 6537 ipw2100_debug_level = debug;
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 758459e72f3d..a72f3e1e991b 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -11753,7 +11753,7 @@ static int __init ipw_init(void)
11753 printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION ", " DRV_VERSION "\n"); 11753 printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION ", " DRV_VERSION "\n");
11754 printk(KERN_INFO DRV_NAME ": " DRV_COPYRIGHT "\n"); 11754 printk(KERN_INFO DRV_NAME ": " DRV_COPYRIGHT "\n");
11755 11755
11756 ret = pci_module_init(&ipw_driver); 11756 ret = pci_register_driver(&ipw_driver);
11757 if (ret) { 11757 if (ret) {
11758 IPW_ERROR("Unable to initialize PCI module\n"); 11758 IPW_ERROR("Unable to initialize PCI module\n");
11759 return ret; 11759 return ret;
diff --git a/drivers/net/wireless/orinoco_nortel.c b/drivers/net/wireless/orinoco_nortel.c
index bf05b907747e..eaf3d13b851c 100644
--- a/drivers/net/wireless/orinoco_nortel.c
+++ b/drivers/net/wireless/orinoco_nortel.c
@@ -304,7 +304,7 @@ MODULE_LICENSE("Dual MPL/GPL");
304static int __init orinoco_nortel_init(void) 304static int __init orinoco_nortel_init(void)
305{ 305{
306 printk(KERN_DEBUG "%s\n", version); 306 printk(KERN_DEBUG "%s\n", version);
307 return pci_module_init(&orinoco_nortel_driver); 307 return pci_register_driver(&orinoco_nortel_driver);
308} 308}
309 309
310static void __exit orinoco_nortel_exit(void) 310static void __exit orinoco_nortel_exit(void)
diff --git a/drivers/net/wireless/orinoco_pci.c b/drivers/net/wireless/orinoco_pci.c
index 1759c543fbee..97a8b4ff32bd 100644
--- a/drivers/net/wireless/orinoco_pci.c
+++ b/drivers/net/wireless/orinoco_pci.c
@@ -244,7 +244,7 @@ MODULE_LICENSE("Dual MPL/GPL");
244static int __init orinoco_pci_init(void) 244static int __init orinoco_pci_init(void)
245{ 245{
246 printk(KERN_DEBUG "%s\n", version); 246 printk(KERN_DEBUG "%s\n", version);
247 return pci_module_init(&orinoco_pci_driver); 247 return pci_register_driver(&orinoco_pci_driver);
248} 248}
249 249
250static void __exit orinoco_pci_exit(void) 250static void __exit orinoco_pci_exit(void)
diff --git a/drivers/net/wireless/orinoco_plx.c b/drivers/net/wireless/orinoco_plx.c
index 7f006f624171..31162ac25a92 100644
--- a/drivers/net/wireless/orinoco_plx.c
+++ b/drivers/net/wireless/orinoco_plx.c
@@ -351,7 +351,7 @@ MODULE_LICENSE("Dual MPL/GPL");
351static int __init orinoco_plx_init(void) 351static int __init orinoco_plx_init(void)
352{ 352{
353 printk(KERN_DEBUG "%s\n", version); 353 printk(KERN_DEBUG "%s\n", version);
354 return pci_module_init(&orinoco_plx_driver); 354 return pci_register_driver(&orinoco_plx_driver);
355} 355}
356 356
357static void __exit orinoco_plx_exit(void) 357static void __exit orinoco_plx_exit(void)
diff --git a/drivers/net/wireless/orinoco_tmd.c b/drivers/net/wireless/orinoco_tmd.c
index 0831721e4d6c..7c7b960c91df 100644
--- a/drivers/net/wireless/orinoco_tmd.c
+++ b/drivers/net/wireless/orinoco_tmd.c
@@ -228,7 +228,7 @@ MODULE_LICENSE("Dual MPL/GPL");
228static int __init orinoco_tmd_init(void) 228static int __init orinoco_tmd_init(void)
229{ 229{
230 printk(KERN_DEBUG "%s\n", version); 230 printk(KERN_DEBUG "%s\n", version);
231 return pci_module_init(&orinoco_tmd_driver); 231 return pci_register_driver(&orinoco_tmd_driver);
232} 232}
233 233
234static void __exit orinoco_tmd_exit(void) 234static void __exit orinoco_tmd_exit(void)
diff --git a/drivers/net/wireless/prism54/islpci_hotplug.c b/drivers/net/wireless/prism54/islpci_hotplug.c
index 09fc17a0f029..f692dccf0d07 100644
--- a/drivers/net/wireless/prism54/islpci_hotplug.c
+++ b/drivers/net/wireless/prism54/islpci_hotplug.c
@@ -313,7 +313,7 @@ prism54_module_init(void)
313 313
314 __bug_on_wrong_struct_sizes (); 314 __bug_on_wrong_struct_sizes ();
315 315
316 return pci_module_init(&prism54_driver); 316 return pci_register_driver(&prism54_driver);
317} 317}
318 318
319/* by the time prism54_module_exit() terminates, as a postcondition 319/* by the time prism54_module_exit() terminates, as a postcondition
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index 8459a18254a4..b6b247433709 100644
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -1434,7 +1434,7 @@ static int __init yellowfin_init (void)
1434#ifdef MODULE 1434#ifdef MODULE
1435 printk(version); 1435 printk(version);
1436#endif 1436#endif
1437 return pci_module_init (&yellowfin_driver); 1437 return pci_register_driver(&yellowfin_driver);
1438} 1438}
1439 1439
1440 1440