convert from pci_module_init to pci_register_driver (from:http://kerneljanitors.org/TODO). Signed-off-by: Christophe Lucas Signed-off-by: Domen Puncer --- kj-domen/drivers/net/3c59x.c | 2 +- kj-domen/drivers/net/8139cp.c | 2 +- kj-domen/drivers/net/8139too.c | 2 +- kj-domen/drivers/net/acenic.c | 2 +- kj-domen/drivers/net/amd8111e.c | 2 +- kj-domen/drivers/net/b44.c | 2 +- kj-domen/drivers/net/defxx.c | 2 +- kj-domen/drivers/net/dl2k.c | 2 +- kj-domen/drivers/net/e100.c | 2 +- kj-domen/drivers/net/eepro100.c | 2 +- kj-domen/drivers/net/epic100.c | 2 +- kj-domen/drivers/net/fealnx.c | 2 +- kj-domen/drivers/net/forcedeth.c | 2 +- kj-domen/drivers/net/hp100.c | 2 +- kj-domen/drivers/net/ioc3-eth.c | 2 +- kj-domen/drivers/net/natsemi.c | 2 +- kj-domen/drivers/net/ne2k-pci.c | 2 +- kj-domen/drivers/net/ns83820.c | 2 +- kj-domen/drivers/net/pci-skeleton.c | 2 +- kj-domen/drivers/net/pcnet32.c | 2 +- kj-domen/drivers/net/r8169.c | 2 +- kj-domen/drivers/net/rrunner.c | 2 +- kj-domen/drivers/net/s2io.c | 2 +- kj-domen/drivers/net/saa9730.c | 2 +- kj-domen/drivers/net/sis900.c | 2 +- kj-domen/drivers/net/starfire.c | 2 +- kj-domen/drivers/net/sundance.c | 2 +- kj-domen/drivers/net/sungem.c | 2 +- kj-domen/drivers/net/tc35815.c | 2 +- kj-domen/drivers/net/tg3.c | 2 +- kj-domen/drivers/net/typhoon.c | 2 +- kj-domen/drivers/net/via-rhine.c | 2 +- kj-domen/drivers/net/via-velocity.c | 2 +- kj-domen/drivers/net/yellowfin.c | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff -puN drivers/net/3c59x.c~pci_register_driver-drivers_net drivers/net/3c59x.c --- kj/drivers/net/3c59x.c~pci_register_driver-drivers_net 2005-04-05 12:56:41.000000000 +0200 +++ kj-domen/drivers/net/3c59x.c 2005-04-05 12:56:42.000000000 +0200 @@ -3308,7 +3308,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) diff -puN drivers/net/8139cp.c~pci_register_driver-drivers_net drivers/net/8139cp.c --- kj/drivers/net/8139cp.c~pci_register_driver-drivers_net 2005-04-05 12:56:41.000000000 +0200 +++ kj-domen/drivers/net/8139cp.c 2005-04-05 12:56:42.000000000 +0200 @@ -1893,7 +1893,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) diff -puN drivers/net/8139too.c~pci_register_driver-drivers_net drivers/net/8139too.c --- kj/drivers/net/8139too.c~pci_register_driver-drivers_net 2005-04-05 12:56:41.000000000 +0200 +++ kj-domen/drivers/net/8139too.c 2005-04-05 12:56:42.000000000 +0200 @@ -2656,7 +2656,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); } diff -puN drivers/net/acenic.c~pci_register_driver-drivers_net drivers/net/acenic.c --- kj/drivers/net/acenic.c~pci_register_driver-drivers_net 2005-04-05 12:56:41.000000000 +0200 +++ kj-domen/drivers/net/acenic.c 2005-04-05 12:56:42.000000000 +0200 @@ -729,7 +729,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) diff -puN drivers/net/amd8111e.c~pci_register_driver-drivers_net drivers/net/amd8111e.c --- kj/drivers/net/amd8111e.c~pci_register_driver-drivers_net 2005-04-05 12:56:41.000000000 +0200 +++ kj-domen/drivers/net/amd8111e.c 2005-04-05 12:56:42.000000000 +0200 @@ -2155,7 +2155,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) diff -puN drivers/net/b44.c~pci_register_driver-drivers_net drivers/net/b44.c --- kj/drivers/net/b44.c~pci_register_driver-drivers_net 2005-04-05 12:56:41.000000000 +0200 +++ kj-domen/drivers/net/b44.c 2005-04-05 12:56:42.000000000 +0200 @@ -1965,7 +1965,7 @@ static struct pci_driver b44_driver = { static int __init b44_init(void) { - return pci_module_init(&b44_driver); + return pci_register_driver(&b44_driver); } static void __exit b44_cleanup(void) diff -puN drivers/net/defxx.c~pci_register_driver-drivers_net drivers/net/defxx.c --- kj/drivers/net/defxx.c~pci_register_driver-drivers_net 2005-04-05 12:56:41.000000000 +0200 +++ kj-domen/drivers/net/defxx.c 2005-04-05 12:56:42.000000000 +0200 @@ -3430,7 +3430,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(); diff -puN drivers/net/dl2k.c~pci_register_driver-drivers_net drivers/net/dl2k.c --- kj/drivers/net/dl2k.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/dl2k.c 2005-04-05 12:56:42.000000000 +0200 @@ -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 diff -puN drivers/net/e100.c~pci_register_driver-drivers_net drivers/net/e100.c --- kj/drivers/net/e100.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/e100.c 2005-04-05 12:56:42.000000000 +0200 @@ -2362,7 +2362,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) diff -puN drivers/net/eepro100.c~pci_register_driver-drivers_net drivers/net/eepro100.c --- kj/drivers/net/eepro100.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/eepro100.c 2005-04-05 12:56:42.000000000 +0200 @@ -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) diff -puN drivers/net/epic100.c~pci_register_driver-drivers_net drivers/net/epic100.c --- kj/drivers/net/epic100.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/epic100.c 2005-04-05 12:56:42.000000000 +0200 @@ -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); } diff -puN drivers/net/fealnx.c~pci_register_driver-drivers_net drivers/net/fealnx.c --- kj/drivers/net/fealnx.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/fealnx.c 2005-04-05 12:56:42.000000000 +0200 @@ -1993,7 +1993,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) diff -puN drivers/net/forcedeth.c~pci_register_driver-drivers_net drivers/net/forcedeth.c --- kj/drivers/net/forcedeth.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/forcedeth.c 2005-04-05 12:56:42.000000000 +0200 @@ -2211,7 +2211,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) diff -puN drivers/net/hp100.c~pci_register_driver-drivers_net drivers/net/hp100.c --- kj/drivers/net/hp100.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/hp100.c 2005-04-05 12:56:42.000000000 +0200 @@ -3075,7 +3075,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 diff -puN drivers/net/ioc3-eth.c~pci_register_driver-drivers_net drivers/net/ioc3-eth.c --- kj/drivers/net/ioc3-eth.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/ioc3-eth.c 2005-04-05 12:56:42.000000000 +0200 @@ -1358,7 +1358,7 @@ static struct pci_driver ioc3_driver = { static int __init ioc3_init_module(void) { - return pci_module_init(&ioc3_driver); + return pci_register_driver(&ioc3_driver); } static void __exit ioc3_cleanup_module(void) diff -puN drivers/net/natsemi.c~pci_register_driver-drivers_net drivers/net/natsemi.c --- kj/drivers/net/natsemi.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/natsemi.c 2005-04-05 12:56:42.000000000 +0200 @@ -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) diff -puN drivers/net/ne2k-pci.c~pci_register_driver-drivers_net drivers/net/ne2k-pci.c --- kj/drivers/net/ne2k-pci.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/ne2k-pci.c 2005-04-05 12:56:42.000000000 +0200 @@ -699,7 +699,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); } diff -puN drivers/net/ns83820.c~pci_register_driver-drivers_net drivers/net/ns83820.c --- kj/drivers/net/ns83820.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/ns83820.c 2005-04-05 12:56:42.000000000 +0200 @@ -2195,7 +2195,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) diff -puN drivers/net/pci-skeleton.c~pci_register_driver-drivers_net drivers/net/pci-skeleton.c --- kj/drivers/net/pci-skeleton.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/pci-skeleton.c 2005-04-05 12:56:42.000000000 +0200 @@ -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); } diff -puN drivers/net/pcnet32.c~pci_register_driver-drivers_net drivers/net/pcnet32.c --- kj/drivers/net/pcnet32.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/pcnet32.c 2005-04-05 12:56:42.000000000 +0200 @@ -2316,7 +2316,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 ? */ diff -puN drivers/net/r8169.c~pci_register_driver-drivers_net drivers/net/r8169.c --- kj/drivers/net/r8169.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/r8169.c 2005-04-05 12:56:42.000000000 +0200 @@ -2510,7 +2510,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 diff -puN drivers/net/rrunner.c~pci_register_driver-drivers_net drivers/net/rrunner.c --- kj/drivers/net/rrunner.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/rrunner.c 2005-04-05 12:56:42.000000000 +0200 @@ -1738,7 +1738,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) diff -puN drivers/net/s2io.c~pci_register_driver-drivers_net drivers/net/s2io.c --- kj/drivers/net/s2io.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/s2io.c 2005-04-05 12:56:42.000000000 +0200 @@ -4932,7 +4932,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); } /** diff -puN drivers/net/saa9730.c~pci_register_driver-drivers_net drivers/net/saa9730.c --- kj/drivers/net/saa9730.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/saa9730.c 2005-04-05 12:56:42.000000000 +0200 @@ -1168,7 +1168,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) diff -puN drivers/net/sis900.c~pci_register_driver-drivers_net drivers/net/sis900.c --- kj/drivers/net/sis900.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/sis900.c 2005-04-05 12:56:42.000000000 +0200 @@ -2357,7 +2357,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) diff -puN drivers/net/starfire.c~pci_register_driver-drivers_net drivers/net/starfire.c --- kj/drivers/net/starfire.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/starfire.c 2005-04-05 12:56:42.000000000 +0200 @@ -2196,7 +2196,7 @@ static int __init starfire_init (void) /* unconditionally disable hw cksums if firmware is not present */ enable_hw_cksum = 0; #endif /* not HAS_FIRMWARE */ - return pci_module_init (&starfire_driver); + return pci_register_driver (&starfire_driver); } diff -puN drivers/net/sundance.c~pci_register_driver-drivers_net drivers/net/sundance.c --- kj/drivers/net/sundance.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/sundance.c 2005-04-05 12:56:42.000000000 +0200 @@ -1771,7 +1771,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) diff -puN drivers/net/sungem.c~pci_register_driver-drivers_net drivers/net/sungem.c --- kj/drivers/net/sungem.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/sungem.c 2005-04-05 12:56:42.000000000 +0200 @@ -3192,7 +3192,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) diff -puN drivers/net/tc35815.c~pci_register_driver-drivers_net drivers/net/tc35815.c --- kj/drivers/net/tc35815.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/tc35815.c 2005-04-05 12:56:42.000000000 +0200 @@ -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) diff -puN drivers/net/tg3.c~pci_register_driver-drivers_net drivers/net/tg3.c --- kj/drivers/net/tg3.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/tg3.c 2005-04-05 12:56:42.000000000 +0200 @@ -9071,7 +9071,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) diff -puN drivers/net/typhoon.c~pci_register_driver-drivers_net drivers/net/typhoon.c --- kj/drivers/net/typhoon.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/typhoon.c 2005-04-05 12:56:42.000000000 +0200 @@ -2660,7 +2660,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 diff -puN drivers/net/via-rhine.c~pci_register_driver-drivers_net drivers/net/via-rhine.c --- kj/drivers/net/via-rhine.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/via-rhine.c 2005-04-05 12:56:42.000000000 +0200 @@ -2021,7 +2021,7 @@ static int __init rhine_init(void) #ifdef MODULE printk(version); #endif - return pci_module_init(&rhine_driver); + return pci_register_driver(&rhine_driver); } diff -puN drivers/net/via-velocity.c~pci_register_driver-drivers_net drivers/net/via-velocity.c --- kj/drivers/net/via-velocity.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/via-velocity.c 2005-04-05 12:56:42.000000000 +0200 @@ -2244,7 +2244,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; diff -puN drivers/net/yellowfin.c~pci_register_driver-drivers_net drivers/net/yellowfin.c --- kj/drivers/net/yellowfin.c~pci_register_driver-drivers_net 2005-04-05 12:56:42.000000000 +0200 +++ kj-domen/drivers/net/yellowfin.c 2005-04-05 12:56:42.000000000 +0200 @@ -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); } _