From linux-kernel-owner+greg=40kroah.com-S1751401AbVK2X76@vger.kernel.org Tue Nov 29 16:05:29 2005 Date: Wed, 30 Nov 2005 00:59:55 +0100 (MET) From: Richard Knutsson Cc: Richard Knutsson Message-Id: <20051130000505.1009.25349.sendpatchset@thinktank.campus.ltu.se> Subject: [PATCH 3/6] drivers/net: Replace pci_module_init() with pci_register_driver() From: Richard Knutsson Replace obsolete pci_module_init() with pci_register_driver(). Signed-off-by: Richard Knutsson Signed-off-by: Greg Kroah-Hartman --- drivers/net/3c59x.c | 2 +- drivers/net/8139cp.c | 2 +- drivers/net/8139too.c | 2 +- drivers/net/acenic.c | 2 +- drivers/net/amd8111e.c | 2 +- drivers/net/arcnet/com20020-pci.c | 2 +- drivers/net/b44.c | 2 +- drivers/net/bnx2.c | 2 +- drivers/net/cassini.c | 2 +- drivers/net/chelsio/cxgb2.c | 2 +- drivers/net/defxx.c | 2 +- drivers/net/dl2k.c | 2 +- drivers/net/e100.c | 2 +- drivers/net/e1000/e1000_main.c | 2 +- drivers/net/eepro100.c | 2 +- drivers/net/epic100.c | 2 +- drivers/net/fealnx.c | 2 +- drivers/net/forcedeth.c | 2 +- drivers/net/hp100.c | 2 +- drivers/net/irda/donauboe.c | 2 +- drivers/net/irda/vlsi_ir.c | 2 +- drivers/net/ixgb/ixgb_main.c | 2 +- drivers/net/natsemi.c | 2 +- drivers/net/ne2k-pci.c | 2 +- drivers/net/ns83820.c | 2 +- drivers/net/pci-skeleton.c | 2 +- drivers/net/pcnet32.c | 2 +- drivers/net/r8169.c | 2 +- drivers/net/rrunner.c | 2 +- drivers/net/s2io.c | 2 +- drivers/net/saa9730.c | 2 +- drivers/net/sis190.c | 2 +- drivers/net/sis900.c | 2 +- drivers/net/skfp/skfddi.c | 2 +- drivers/net/skge.c | 2 +- drivers/net/starfire.c | 2 +- drivers/net/sundance.c | 2 +- drivers/net/sungem.c | 2 +- drivers/net/tc35815.c | 2 +- drivers/net/tg3.c | 2 +- drivers/net/tokenring/3c359.c | 2 +- drivers/net/tokenring/lanstreamer.c | 2 +- drivers/net/tokenring/olympic.c | 2 +- drivers/net/tulip/de2104x.c | 2 +- drivers/net/tulip/de4x5.c | 2 +- drivers/net/tulip/dmfe.c | 2 +- drivers/net/tulip/tulip_core.c | 2 +- drivers/net/tulip/uli526x.c | 2 +- drivers/net/tulip/winbond-840.c | 2 +- drivers/net/tulip/xircom_tulip_cb.c | 2 +- drivers/net/typhoon.c | 2 +- drivers/net/via-rhine.c | 2 +- drivers/net/via-velocity.c | 2 +- drivers/net/wan/dscc4.c | 2 +- drivers/net/wan/farsync.c | 2 +- drivers/net/wan/lmc/lmc_main.c | 2 +- drivers/net/wan/pc300_drv.c | 2 +- drivers/net/wan/pci200syn.c | 2 +- drivers/net/wan/wanxl.c | 2 +- drivers/net/wireless/atmel_pci.c | 2 +- drivers/net/wireless/ipw2100.c | 2 +- drivers/net/wireless/ipw2200.c | 2 +- drivers/net/wireless/orinoco_nortel.c | 2 +- drivers/net/wireless/orinoco_pci.c | 2 +- drivers/net/wireless/orinoco_plx.c | 2 +- drivers/net/wireless/orinoco_tmd.c | 2 +- drivers/net/wireless/prism54/islpci_hotplug.c | 2 +- drivers/net/yellowfin.c | 2 +- 68 files changed, 68 insertions(+), 68 deletions(-) --- gregkh-2.6.orig/drivers/net/3c59x.c +++ gregkh-2.6/drivers/net/3c59x.c @@ -3367,7 +3367,7 @@ static int __init vortex_init (void) { int pci_rc, eisa_rc; - pci_rc = pci_module_init(&vortex_driver); + pci_rc = pci_register_driver(&vortex_driver); eisa_rc = vortex_eisa_init(); if (pci_rc == 0) --- gregkh-2.6.orig/drivers/net/8139cp.c +++ gregkh-2.6/drivers/net/8139cp.c @@ -1939,7 +1939,7 @@ static int __init cp_init (void) #ifdef MODULE printk("%s", version); #endif - return pci_module_init (&cp_driver); + return pci_register_driver (&cp_driver); } static void __exit cp_exit (void) --- gregkh-2.6.orig/drivers/net/8139too.c +++ gregkh-2.6/drivers/net/8139too.c @@ -2613,7 +2613,7 @@ static int __init rtl8139_init_module (v printk (KERN_INFO RTL8139_DRIVER_NAME "\n"); #endif - return pci_module_init (&rtl8139_pci_driver); + return pci_register_driver (&rtl8139_pci_driver); } --- gregkh-2.6.orig/drivers/net/acenic.c +++ gregkh-2.6/drivers/net/acenic.c @@ -730,7 +730,7 @@ static struct pci_driver acenic_pci_driv static int __init acenic_init(void) { - return pci_module_init(&acenic_pci_driver); + return pci_register_driver(&acenic_pci_driver); } static void __exit acenic_exit(void) --- gregkh-2.6.orig/drivers/net/amd8111e.c +++ gregkh-2.6/drivers/net/amd8111e.c @@ -2159,7 +2159,7 @@ static struct pci_driver amd8111e_driver static int __init amd8111e_init(void) { - return pci_module_init(&amd8111e_driver); + return pci_register_driver(&amd8111e_driver); } static void __exit amd8111e_cleanup(void) --- gregkh-2.6.orig/drivers/net/arcnet/com20020-pci.c +++ gregkh-2.6/drivers/net/arcnet/com20020-pci.c @@ -177,7 +177,7 @@ static struct pci_driver com20020pci_dri static int __init com20020pci_init(void) { BUGLVL(D_NORMAL) printk(VERSION); - return pci_module_init(&com20020pci_driver); + return pci_register_driver(&com20020pci_driver); } static void __exit com20020pci_cleanup(void) --- gregkh-2.6.orig/drivers/net/b44.c +++ gregkh-2.6/drivers/net/b44.c @@ -2138,7 +2138,7 @@ static int __init b44_init(void) dma_desc_align_mask = ~(dma_desc_align_size - 1); dma_desc_sync_size = max(dma_desc_align_size, sizeof(struct dma_desc)); - return pci_module_init(&b44_driver); + return pci_register_driver(&b44_driver); } static void __exit b44_cleanup(void) --- gregkh-2.6.orig/drivers/net/bnx2.c +++ gregkh-2.6/drivers/net/bnx2.c @@ -5849,7 +5849,7 @@ static struct pci_driver bnx2_pci_driver static int __init bnx2_init(void) { - return pci_module_init(&bnx2_pci_driver); + return pci_register_driver(&bnx2_pci_driver); } static void __exit bnx2_cleanup(void) --- gregkh-2.6.orig/drivers/net/cassini.c +++ gregkh-2.6/drivers/net/cassini.c @@ -5224,7 +5224,7 @@ static int __init cas_init(void) else link_transition_timeout = 0; - return pci_module_init(&cas_driver); + return pci_register_driver(&cas_driver); } static void __exit cas_cleanup(void) --- gregkh-2.6.orig/drivers/net/chelsio/cxgb2.c +++ gregkh-2.6/drivers/net/chelsio/cxgb2.c @@ -1244,7 +1244,7 @@ static struct pci_driver driver = { static int __init t1_init_module(void) { - return pci_module_init(&driver); + return pci_register_driver(&driver); } static void __exit t1_cleanup_module(void) --- gregkh-2.6.orig/drivers/net/defxx.c +++ gregkh-2.6/drivers/net/defxx.c @@ -3444,7 +3444,7 @@ static int __init dfx_init(void) { int rc_pci, rc_eisa; - rc_pci = pci_module_init(&dfx_driver); + rc_pci = pci_register_driver(&dfx_driver); if (rc_pci >= 0) dfx_have_pci = 1; rc_eisa = dfx_eisa_init(); --- gregkh-2.6.orig/drivers/net/dl2k.c +++ gregkh-2.6/drivers/net/dl2k.c @@ -1848,7 +1848,7 @@ static struct pci_driver rio_driver = { static int __init rio_init (void) { - return pci_module_init (&rio_driver); + return pci_register_driver (&rio_driver); } static void __exit --- gregkh-2.6.orig/drivers/net/e1000/e1000_main.c +++ gregkh-2.6/drivers/net/e1000/e1000_main.c @@ -258,7 +258,7 @@ e1000_init_module(void) printk(KERN_INFO "%s\n", e1000_copyright); - ret = pci_module_init(&e1000_driver); + ret = pci_register_driver(&e1000_driver); return ret; } --- gregkh-2.6.orig/drivers/net/e100.c +++ gregkh-2.6/drivers/net/e100.c @@ -2792,7 +2792,7 @@ static int __init e100_init_module(void) printk(KERN_INFO PFX "%s, %s\n", DRV_DESCRIPTION, DRV_VERSION); printk(KERN_INFO PFX "%s\n", DRV_COPYRIGHT); } - return pci_module_init(&e100_driver); + return pci_register_driver(&e100_driver); } static void __exit e100_cleanup_module(void) --- gregkh-2.6.orig/drivers/net/eepro100.c +++ gregkh-2.6/drivers/net/eepro100.c @@ -2391,7 +2391,7 @@ static int __init eepro100_init_module(v #ifdef MODULE printk(version); #endif - return pci_module_init(&eepro100_driver); + return pci_register_driver(&eepro100_driver); } static void __exit eepro100_cleanup_module(void) --- gregkh-2.6.orig/drivers/net/epic100.c +++ gregkh-2.6/drivers/net/epic100.c @@ -1673,7 +1673,7 @@ static int __init epic_init (void) version, version2, version3); #endif - return pci_module_init (&epic_driver); + return pci_register_driver (&epic_driver); } --- gregkh-2.6.orig/drivers/net/fealnx.c +++ gregkh-2.6/drivers/net/fealnx.c @@ -1992,7 +1992,7 @@ static int __init fealnx_init(void) printk(version); #endif - return pci_module_init(&fealnx_driver); + return pci_register_driver(&fealnx_driver); } static void __exit fealnx_exit(void) --- gregkh-2.6.orig/drivers/net/forcedeth.c +++ gregkh-2.6/drivers/net/forcedeth.c @@ -2721,7 +2721,7 @@ static struct pci_driver driver = { static int __init init_nic(void) { printk(KERN_INFO "forcedeth.c: Reverse Engineered nForce ethernet driver. Version %s.\n", FORCEDETH_VERSION); - return pci_module_init(&driver); + return pci_register_driver(&driver); } static void __exit exit_nic(void) --- gregkh-2.6.orig/drivers/net/hp100.c +++ gregkh-2.6/drivers/net/hp100.c @@ -3048,7 +3048,7 @@ static int __init hp100_module_init(void goto out2; #endif #ifdef CONFIG_PCI - err = pci_module_init(&hp100_pci_driver); + err = pci_register_driver(&hp100_pci_driver); if (err && err != -ENODEV) goto out3; #endif --- gregkh-2.6.orig/drivers/net/irda/donauboe.c +++ gregkh-2.6/drivers/net/irda/donauboe.c @@ -1778,7 +1778,7 @@ static struct pci_driver donauboe_pci_dr static int __init donauboe_init (void) { - return pci_module_init(&donauboe_pci_driver); + return pci_register_driver(&donauboe_pci_driver); } static void __exit --- gregkh-2.6.orig/drivers/net/irda/vlsi_ir.c +++ gregkh-2.6/drivers/net/irda/vlsi_ir.c @@ -1887,7 +1887,7 @@ static int __init vlsi_mod_init(void) vlsi_proc_root->owner = THIS_MODULE; } - ret = pci_module_init(&vlsi_irda_driver); + ret = pci_register_driver(&vlsi_irda_driver); if (ret && vlsi_proc_root) remove_proc_entry(PROC_DIR, NULL); --- gregkh-2.6.orig/drivers/net/ixgb/ixgb_main.c +++ gregkh-2.6/drivers/net/ixgb/ixgb_main.c @@ -183,7 +183,7 @@ ixgb_init_module(void) printk(KERN_INFO "%s\n", ixgb_copyright); - return pci_module_init(&ixgb_driver); + return pci_register_driver(&ixgb_driver); } module_init(ixgb_init_module); --- gregkh-2.6.orig/drivers/net/natsemi.c +++ gregkh-2.6/drivers/net/natsemi.c @@ -3260,7 +3260,7 @@ static int __init natsemi_init_mod (void printk(version); #endif - return pci_module_init (&natsemi_driver); + return pci_register_driver (&natsemi_driver); } static void __exit natsemi_exit_mod (void) --- gregkh-2.6.orig/drivers/net/ne2k-pci.c +++ gregkh-2.6/drivers/net/ne2k-pci.c @@ -703,7 +703,7 @@ static int __init ne2k_pci_init(void) #ifdef MODULE printk(version); #endif - return pci_module_init (&ne2k_driver); + return pci_register_driver (&ne2k_driver); } --- gregkh-2.6.orig/drivers/net/ns83820.c +++ gregkh-2.6/drivers/net/ns83820.c @@ -2176,7 +2176,7 @@ static struct pci_driver driver = { static int __init ns83820_init(void) { printk(KERN_INFO "ns83820.c: National Semiconductor DP83820 10/100/1000 driver.\n"); - return pci_module_init(&driver); + return pci_register_driver(&driver); } static void __exit ns83820_exit(void) --- gregkh-2.6.orig/drivers/net/pci-skeleton.c +++ gregkh-2.6/drivers/net/pci-skeleton.c @@ -1963,7 +1963,7 @@ static int __init netdrv_init_module (vo #ifdef MODULE printk(version); #endif - return pci_module_init (&netdrv_pci_driver); + return pci_register_driver (&netdrv_pci_driver); } --- gregkh-2.6.orig/drivers/net/pcnet32.c +++ gregkh-2.6/drivers/net/pcnet32.c @@ -2508,7 +2508,7 @@ static int __init pcnet32_init_module(vo tx_start = tx_start_pt; /* find the PCI devices */ - if (!pci_module_init(&pcnet32_driver)) + if (!pci_register_driver(&pcnet32_driver)) pcnet32_have_pci = 1; /* should we find any remaining VLbus devices ? */ --- gregkh-2.6.orig/drivers/net/r8169.c +++ gregkh-2.6/drivers/net/r8169.c @@ -2713,7 +2713,7 @@ static struct pci_driver rtl8169_pci_dri static int __init rtl8169_init_module(void) { - return pci_module_init(&rtl8169_pci_driver); + return pci_register_driver(&rtl8169_pci_driver); } static void __exit --- gregkh-2.6.orig/drivers/net/rrunner.c +++ gregkh-2.6/drivers/net/rrunner.c @@ -1737,7 +1737,7 @@ static struct pci_driver rr_driver = { static int __init rr_init_module(void) { - return pci_module_init(&rr_driver); + return pci_register_driver(&rr_driver); } static void __exit rr_cleanup_module(void) --- gregkh-2.6.orig/drivers/net/s2io.c +++ gregkh-2.6/drivers/net/s2io.c @@ -6335,7 +6335,7 @@ static void __devexit s2io_rem_nic(struc int __init s2io_starter(void) { - return pci_module_init(&s2io_driver); + return pci_register_driver(&s2io_driver); } /** --- gregkh-2.6.orig/drivers/net/saa9730.c +++ gregkh-2.6/drivers/net/saa9730.c @@ -1131,7 +1131,7 @@ static struct pci_driver saa9730_driver static int __init saa9730_init(void) { - return pci_module_init(&saa9730_driver); + return pci_register_driver(&saa9730_driver); } static void __exit saa9730_cleanup(void) --- gregkh-2.6.orig/drivers/net/sis190.c +++ gregkh-2.6/drivers/net/sis190.c @@ -1872,7 +1872,7 @@ static struct pci_driver sis190_pci_driv static int __init sis190_init_module(void) { - return pci_module_init(&sis190_pci_driver); + return pci_register_driver(&sis190_pci_driver); } static void __exit sis190_cleanup_module(void) --- gregkh-2.6.orig/drivers/net/sis900.c +++ gregkh-2.6/drivers/net/sis900.c @@ -2479,7 +2479,7 @@ static int __init sis900_init_module(voi printk(version); #endif - return pci_module_init(&sis900_pci_driver); + return pci_register_driver(&sis900_pci_driver); } static void __exit sis900_cleanup_module(void) --- gregkh-2.6.orig/drivers/net/skfp/skfddi.c +++ gregkh-2.6/drivers/net/skfp/skfddi.c @@ -2280,7 +2280,7 @@ static struct pci_driver skfddi_pci_driv static int __init skfd_init(void) { - return pci_module_init(&skfddi_pci_driver); + return pci_register_driver(&skfddi_pci_driver); } static void __exit skfd_exit(void) --- gregkh-2.6.orig/drivers/net/skge.c +++ gregkh-2.6/drivers/net/skge.c @@ -3438,7 +3438,7 @@ static struct pci_driver skge_driver = { static int __init skge_init_module(void) { - return pci_module_init(&skge_driver); + return pci_register_driver(&skge_driver); } static void __exit skge_cleanup_module(void) --- gregkh-2.6.orig/drivers/net/starfire.c +++ gregkh-2.6/drivers/net/starfire.c @@ -2137,7 +2137,7 @@ static int __init starfire_init (void) return -ENODEV; } - return pci_module_init (&starfire_driver); + return pci_register_driver (&starfire_driver); } --- gregkh-2.6.orig/drivers/net/sundance.c +++ gregkh-2.6/drivers/net/sundance.c @@ -1806,7 +1806,7 @@ static int __init sundance_init(void) #ifdef MODULE printk(version); #endif - return pci_module_init(&sundance_driver); + return pci_register_driver(&sundance_driver); } static void __exit sundance_exit(void) --- gregkh-2.6.orig/drivers/net/sungem.c +++ gregkh-2.6/drivers/net/sungem.c @@ -3190,7 +3190,7 @@ static struct pci_driver gem_driver = { static int __init gem_init(void) { - return pci_module_init(&gem_driver); + return pci_register_driver(&gem_driver); } static void __exit gem_cleanup(void) --- gregkh-2.6.orig/drivers/net/tc35815.c +++ gregkh-2.6/drivers/net/tc35815.c @@ -1725,7 +1725,7 @@ static struct pci_driver tc35815_driver static int __init tc35815_init_module(void) { - return pci_module_init(&tc35815_driver); + return pci_register_driver(&tc35815_driver); } static void __exit tc35815_cleanup_module(void) --- gregkh-2.6.orig/drivers/net/tg3.c +++ gregkh-2.6/drivers/net/tg3.c @@ -10952,7 +10952,7 @@ static struct pci_driver tg3_driver = { static int __init tg3_init(void) { - return pci_module_init(&tg3_driver); + return pci_register_driver(&tg3_driver); } static void __exit tg3_cleanup(void) --- gregkh-2.6.orig/drivers/net/tokenring/3c359.c +++ gregkh-2.6/drivers/net/tokenring/3c359.c @@ -1816,7 +1816,7 @@ static struct pci_driver xl_3c359_driver static int __init xl_pci_init (void) { - return pci_module_init (&xl_3c359_driver); + return pci_register_driver (&xl_3c359_driver); } --- gregkh-2.6.orig/drivers/net/tokenring/lanstreamer.c +++ gregkh-2.6/drivers/net/tokenring/lanstreamer.c @@ -1998,7 +1998,7 @@ static struct pci_driver streamer_pci_dr }; static int __init streamer_init_module(void) { - return pci_module_init(&streamer_pci_driver); + return pci_register_driver(&streamer_pci_driver); } static void __exit streamer_cleanup_module(void) { --- gregkh-2.6.orig/drivers/net/tokenring/olympic.c +++ gregkh-2.6/drivers/net/tokenring/olympic.c @@ -1771,7 +1771,7 @@ static struct pci_driver olympic_driver static int __init olympic_pci_init(void) { - return pci_module_init (&olympic_driver) ; + return pci_register_driver (&olympic_driver) ; } static void __exit olympic_pci_cleanup(void) --- gregkh-2.6.orig/drivers/net/tulip/de2104x.c +++ gregkh-2.6/drivers/net/tulip/de2104x.c @@ -2178,7 +2178,7 @@ static int __init de_init (void) #ifdef MODULE printk("%s", version); #endif - return pci_module_init (&de_driver); + return pci_register_driver (&de_driver); } static void __exit de_exit (void) --- gregkh-2.6.orig/drivers/net/tulip/de4x5.c +++ gregkh-2.6/drivers/net/tulip/de4x5.c @@ -5755,7 +5755,7 @@ static int __init de4x5_module_init (voi int err = 0; #ifdef CONFIG_PCI - err = pci_module_init (&de4x5_pci_driver); + err = pci_register_driver (&de4x5_pci_driver); #endif #ifdef CONFIG_EISA err |= eisa_driver_register (&de4x5_eisa_driver); --- gregkh-2.6.orig/drivers/net/tulip/dmfe.c +++ gregkh-2.6/drivers/net/tulip/dmfe.c @@ -2039,7 +2039,7 @@ static int __init dmfe_init_module(void) if (HPNA_NoiseFloor > 15) HPNA_NoiseFloor = 0; - rc = pci_module_init(&dmfe_driver); + rc = pci_register_driver(&dmfe_driver); if (rc < 0) return rc; --- gregkh-2.6.orig/drivers/net/tulip/tulip_core.c +++ gregkh-2.6/drivers/net/tulip/tulip_core.c @@ -1854,7 +1854,7 @@ static int __init tulip_init (void) tulip_max_interrupt_work = max_interrupt_work; /* probe for and init boards */ - return pci_module_init (&tulip_driver); + return pci_register_driver (&tulip_driver); } --- gregkh-2.6.orig/drivers/net/tulip/uli526x.c +++ gregkh-2.6/drivers/net/tulip/uli526x.c @@ -1725,7 +1725,7 @@ static int __init uli526x_init_module(vo break; } - rc = pci_module_init(&uli526x_driver); + rc = pci_register_driver(&uli526x_driver); if (rc < 0) return rc; --- gregkh-2.6.orig/drivers/net/tulip/winbond-840.c +++ gregkh-2.6/drivers/net/tulip/winbond-840.c @@ -1705,7 +1705,7 @@ static struct pci_driver w840_driver = { static int __init w840_init(void) { printk(version); - return pci_module_init(&w840_driver); + return pci_register_driver(&w840_driver); } static void __exit w840_exit(void) --- gregkh-2.6.orig/drivers/net/tulip/xircom_tulip_cb.c +++ gregkh-2.6/drivers/net/tulip/xircom_tulip_cb.c @@ -1727,7 +1727,7 @@ static int __init xircom_init(void) #ifdef MODULE printk(version); #endif - return pci_module_init(&xircom_driver); + return pci_register_driver(&xircom_driver); } --- gregkh-2.6.orig/drivers/net/typhoon.c +++ gregkh-2.6/drivers/net/typhoon.c @@ -2659,7 +2659,7 @@ static struct pci_driver typhoon_driver static int __init typhoon_init(void) { - return pci_module_init(&typhoon_driver); + return pci_register_driver(&typhoon_driver); } static void __exit --- gregkh-2.6.orig/drivers/net/via-rhine.c +++ gregkh-2.6/drivers/net/via-rhine.c @@ -2049,7 +2049,7 @@ static int __init rhine_init(void) #ifdef MODULE printk(version); #endif - return pci_module_init(&rhine_driver); + return pci_register_driver(&rhine_driver); } --- gregkh-2.6.orig/drivers/net/via-velocity.c +++ gregkh-2.6/drivers/net/via-velocity.c @@ -2241,7 +2241,7 @@ static int __init velocity_init_module(v int ret; velocity_register_notifier(); - ret = pci_module_init(&velocity_driver); + ret = pci_register_driver(&velocity_driver); if (ret < 0) velocity_unregister_notifier(); return ret; --- gregkh-2.6.orig/drivers/net/wan/dscc4.c +++ gregkh-2.6/drivers/net/wan/dscc4.c @@ -2061,7 +2061,7 @@ static struct pci_driver dscc4_driver = static int __init dscc4_init_module(void) { - return pci_module_init(&dscc4_driver); + return pci_register_driver(&dscc4_driver); } static void __exit dscc4_cleanup_module(void) --- gregkh-2.6.orig/drivers/net/wan/farsync.c +++ gregkh-2.6/drivers/net/wan/farsync.c @@ -2697,7 +2697,7 @@ fst_init(void) for (i = 0; i < FST_MAX_CARDS; i++) fst_card_array[i] = NULL; spin_lock_init(&fst_work_q_lock); - return pci_module_init(&fst_driver); + return pci_register_driver(&fst_driver); } static void __exit --- gregkh-2.6.orig/drivers/net/wan/lmc/lmc_main.c +++ gregkh-2.6/drivers/net/wan/lmc/lmc_main.c @@ -1790,7 +1790,7 @@ static struct pci_driver lmc_driver = { static int __init init_lmc(void) { - return pci_module_init(&lmc_driver); + return pci_register_driver(&lmc_driver); } static void __exit exit_lmc(void) --- gregkh-2.6.orig/drivers/net/wan/pc300_drv.c +++ gregkh-2.6/drivers/net/wan/pc300_drv.c @@ -3677,7 +3677,7 @@ static struct pci_driver cpc_driver = { static int __init cpc_init(void) { - return pci_module_init(&cpc_driver); + return pci_register_driver(&cpc_driver); } static void __exit cpc_cleanup_module(void) --- gregkh-2.6.orig/drivers/net/wan/pci200syn.c +++ gregkh-2.6/drivers/net/wan/pci200syn.c @@ -468,7 +468,7 @@ static int __init pci200_init_module(voi printk(KERN_ERR "pci200syn: Invalid PCI clock frequency\n"); return -EINVAL; } - return pci_module_init(&pci200_pci_driver); + return pci_register_driver(&pci200_pci_driver); } --- gregkh-2.6.orig/drivers/net/wan/wanxl.c +++ gregkh-2.6/drivers/net/wan/wanxl.c @@ -822,7 +822,7 @@ static int __init wanxl_init_module(void #ifdef MODULE printk(KERN_INFO "%s\n", version); #endif - return pci_module_init(&wanxl_pci_driver); + return pci_register_driver(&wanxl_pci_driver); } static void __exit wanxl_cleanup_module(void) --- gregkh-2.6.orig/drivers/net/wireless/atmel_pci.c +++ gregkh-2.6/drivers/net/wireless/atmel_pci.c @@ -77,7 +77,7 @@ static void __devexit atmel_pci_remove(s static int __init atmel_init_module(void) { - return pci_module_init(&atmel_driver); + return pci_register_driver(&atmel_driver); } static void __exit atmel_cleanup_module(void) --- gregkh-2.6.orig/drivers/net/wireless/ipw2100.c +++ gregkh-2.6/drivers/net/wireless/ipw2100.c @@ -6856,7 +6856,7 @@ static int __init ipw2100_init(void) printk(KERN_INFO DRV_NAME ": %s, %s\n", DRV_DESCRIPTION, DRV_VERSION); printk(KERN_INFO DRV_NAME ": %s\n", DRV_COPYRIGHT); - ret = pci_module_init(&ipw2100_pci_driver); + ret = pci_register_driver(&ipw2100_pci_driver); #ifdef CONFIG_IPW2100_DEBUG ipw2100_debug_level = debug; --- gregkh-2.6.orig/drivers/net/wireless/ipw2200.c +++ gregkh-2.6/drivers/net/wireless/ipw2200.c @@ -11215,7 +11215,7 @@ static int __init ipw_init(void) printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION ", " DRV_VERSION "\n"); printk(KERN_INFO DRV_NAME ": " DRV_COPYRIGHT "\n"); - ret = pci_module_init(&ipw_driver); + ret = pci_register_driver(&ipw_driver); if (ret) { IPW_ERROR("Unable to initialize PCI module\n"); return ret; --- gregkh-2.6.orig/drivers/net/wireless/orinoco_nortel.c +++ gregkh-2.6/drivers/net/wireless/orinoco_nortel.c @@ -291,7 +291,7 @@ MODULE_LICENSE("Dual MPL/GPL"); static int __init nortel_pci_init(void) { printk(KERN_DEBUG "%s\n", version); - return pci_module_init(&nortel_pci_driver); + return pci_register_driver(&nortel_pci_driver); } static void __exit nortel_pci_exit(void) --- gregkh-2.6.orig/drivers/net/wireless/orinoco_pci.c +++ gregkh-2.6/drivers/net/wireless/orinoco_pci.c @@ -379,7 +379,7 @@ MODULE_LICENSE("Dual MPL/GPL"); static int __init orinoco_pci_init(void) { printk(KERN_DEBUG "%s\n", version); - return pci_module_init(&orinoco_pci_driver); + return pci_register_driver(&orinoco_pci_driver); } static void __exit orinoco_pci_exit(void) --- gregkh-2.6.orig/drivers/net/wireless/orinoco_plx.c +++ gregkh-2.6/drivers/net/wireless/orinoco_plx.c @@ -382,7 +382,7 @@ MODULE_LICENSE("Dual MPL/GPL"); static int __init orinoco_plx_init(void) { printk(KERN_DEBUG "%s\n", version); - return pci_module_init(&orinoco_plx_driver); + return pci_register_driver(&orinoco_plx_driver); } static void __exit orinoco_plx_exit(void) --- gregkh-2.6.orig/drivers/net/wireless/orinoco_tmd.c +++ gregkh-2.6/drivers/net/wireless/orinoco_tmd.c @@ -239,7 +239,7 @@ MODULE_LICENSE("Dual MPL/GPL"); static int __init orinoco_tmd_init(void) { printk(KERN_DEBUG "%s\n", version); - return pci_module_init(&orinoco_tmd_driver); + return pci_register_driver(&orinoco_tmd_driver); } static void __exit orinoco_tmd_exit(void) --- gregkh-2.6.orig/drivers/net/wireless/prism54/islpci_hotplug.c +++ gregkh-2.6/drivers/net/wireless/prism54/islpci_hotplug.c @@ -312,7 +312,7 @@ prism54_module_init(void) __bug_on_wrong_struct_sizes (); - return pci_module_init(&prism54_driver); + return pci_register_driver(&prism54_driver); } /* by the time prism54_module_exit() terminates, as a postcondition --- gregkh-2.6.orig/drivers/net/yellowfin.c +++ gregkh-2.6/drivers/net/yellowfin.c @@ -1474,7 +1474,7 @@ static int __init yellowfin_init (void) #ifdef MODULE printk(version); #endif - return pci_module_init (&yellowfin_driver); + return pci_register_driver (&yellowfin_driver); }