From: Richard Knutsson Replace obsolete pci_module_init() with pci_register_driver(). Signed-off-by: Richard Knutsson Signed-off-by: Andrew Morton --- drivers/edac/amd76x_edac.c | 2 +- drivers/edac/e7xxx_edac.c | 2 +- drivers/edac/r82600_edac.c | 2 +- drivers/net/wireless/tiacx/pci.c | 2 +- drivers/scsi/arcmsr/arcmsr.c | 2 +- drivers/scsi/pata_amd.c | 2 +- drivers/scsi/pata_opti.c | 2 +- drivers/scsi/pata_pdc2027x.c | 2 +- drivers/scsi/pata_sil680.c | 2 +- drivers/scsi/pata_triflex.c | 2 +- drivers/scsi/pata_via.c | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff -puN drivers/edac/amd76x_edac.c~drivers-replace-pci_module_init-with-pci_register_driver-in-mm drivers/edac/amd76x_edac.c --- devel/drivers/edac/amd76x_edac.c~drivers-replace-pci_module_init-with-pci_register_driver-in-mm 2005-12-22 05:10:30.000000000 -0800 +++ devel-akpm/drivers/edac/amd76x_edac.c 2005-12-22 05:10:30.000000000 -0800 @@ -340,7 +340,7 @@ static struct pci_driver amd76x_driver = static int __init amd76x_init(void) { - return pci_module_init(&amd76x_driver); + return pci_register_driver(&amd76x_driver); } static void __exit amd76x_exit(void) diff -puN drivers/edac/e7xxx_edac.c~drivers-replace-pci_module_init-with-pci_register_driver-in-mm drivers/edac/e7xxx_edac.c --- devel/drivers/edac/e7xxx_edac.c~drivers-replace-pci_module_init-with-pci_register_driver-in-mm 2005-12-22 05:10:30.000000000 -0800 +++ devel-akpm/drivers/edac/e7xxx_edac.c 2005-12-22 05:10:30.000000000 -0800 @@ -539,7 +539,7 @@ static struct pci_driver e7xxx_driver = static int __init e7xxx_init(void) { - return pci_module_init(&e7xxx_driver); + return pci_register_driver(&e7xxx_driver); } diff -puN drivers/edac/r82600_edac.c~drivers-replace-pci_module_init-with-pci_register_driver-in-mm drivers/edac/r82600_edac.c --- devel/drivers/edac/r82600_edac.c~drivers-replace-pci_module_init-with-pci_register_driver-in-mm 2005-12-22 05:10:30.000000000 -0800 +++ devel-akpm/drivers/edac/r82600_edac.c 2005-12-22 05:10:30.000000000 -0800 @@ -383,7 +383,7 @@ static struct pci_driver r82600_driver = static int __init r82600_init(void) { - return pci_module_init(&r82600_driver); + return pci_register_driver(&r82600_driver); } diff -puN drivers/net/wireless/tiacx/pci.c~drivers-replace-pci_module_init-with-pci_register_driver-in-mm drivers/net/wireless/tiacx/pci.c --- devel/drivers/net/wireless/tiacx/pci.c~drivers-replace-pci_module_init-with-pci_register_driver-in-mm 2005-12-22 05:10:30.000000000 -0800 +++ devel-akpm/drivers/net/wireless/tiacx/pci.c 2005-12-22 05:10:30.000000000 -0800 @@ -4607,7 +4607,7 @@ acxpci_e_init_module(void) acxlog(L_INIT, "PCI module " WLAN_RELEASE " initialized, " "waiting for cards to probe...\n"); - res = pci_module_init(&acxpci_drv_id); + res = pci_register_driver(&acxpci_drv_id); FN_EXIT1(res); return res; } diff -puN drivers/scsi/arcmsr/arcmsr.c~drivers-replace-pci_module_init-with-pci_register_driver-in-mm drivers/scsi/arcmsr/arcmsr.c --- devel/drivers/scsi/arcmsr/arcmsr.c~drivers-replace-pci_module_init-with-pci_register_driver-in-mm 2005-12-22 05:10:30.000000000 -0800 +++ devel-akpm/drivers/scsi/arcmsr/arcmsr.c 2005-12-22 05:10:30.000000000 -0800 @@ -519,7 +519,7 @@ static int arcmsr_scsi_host_template_ini ** register as a PCI hot-plug driver module */ memset(pHCBARC, 0, sizeof(struct _HCBARC)); - error = pci_module_init(&arcmsr_pci_driver); + error = pci_register_driver(&arcmsr_pci_driver); if (pHCBARC->pACB[0] != NULL) { host_template->proc_name = "arcmsr"; register_reboot_notifier(&arcmsr_event_notifier); diff -puN drivers/scsi/pata_amd.c~drivers-replace-pci_module_init-with-pci_register_driver-in-mm drivers/scsi/pata_amd.c --- devel/drivers/scsi/pata_amd.c~drivers-replace-pci_module_init-with-pci_register_driver-in-mm 2005-12-22 05:10:30.000000000 -0800 +++ devel-akpm/drivers/scsi/pata_amd.c 2005-12-22 05:10:30.000000000 -0800 @@ -625,7 +625,7 @@ static struct pci_driver amd_pci_driver static int __init amd_init(void) { - return pci_module_init(&amd_pci_driver); + return pci_register_driver(&amd_pci_driver); } static void __exit amd_exit(void) diff -puN drivers/scsi/pata_opti.c~drivers-replace-pci_module_init-with-pci_register_driver-in-mm drivers/scsi/pata_opti.c --- devel/drivers/scsi/pata_opti.c~drivers-replace-pci_module_init-with-pci_register_driver-in-mm 2005-12-22 05:10:30.000000000 -0800 +++ devel-akpm/drivers/scsi/pata_opti.c 2005-12-22 05:10:30.000000000 -0800 @@ -247,7 +247,7 @@ static struct pci_driver opti_pci_driver static int __init opti_init(void) { - return pci_module_init(&opti_pci_driver); + return pci_register_driver(&opti_pci_driver); } diff -puN drivers/scsi/pata_pdc2027x.c~drivers-replace-pci_module_init-with-pci_register_driver-in-mm drivers/scsi/pata_pdc2027x.c --- devel/drivers/scsi/pata_pdc2027x.c~drivers-replace-pci_module_init-with-pci_register_driver-in-mm 2005-12-22 05:10:30.000000000 -0800 +++ devel-akpm/drivers/scsi/pata_pdc2027x.c 2005-12-22 05:10:30.000000000 -0800 @@ -840,7 +840,7 @@ static void __devexit pdc2027x_remove_on */ static int __init pdc2027x_init(void) { - return pci_module_init(&pdc2027x_pci_driver); + return pci_register_driver(&pdc2027x_pci_driver); } /** diff -puN drivers/scsi/pata_sil680.c~drivers-replace-pci_module_init-with-pci_register_driver-in-mm drivers/scsi/pata_sil680.c --- devel/drivers/scsi/pata_sil680.c~drivers-replace-pci_module_init-with-pci_register_driver-in-mm 2005-12-22 05:10:30.000000000 -0800 +++ devel-akpm/drivers/scsi/pata_sil680.c 2005-12-22 05:10:30.000000000 -0800 @@ -341,7 +341,7 @@ static struct pci_driver sil680_pci_driv static int __init sil680_init(void) { - return pci_module_init(&sil680_pci_driver); + return pci_register_driver(&sil680_pci_driver); } diff -puN drivers/scsi/pata_triflex.c~drivers-replace-pci_module_init-with-pci_register_driver-in-mm drivers/scsi/pata_triflex.c --- devel/drivers/scsi/pata_triflex.c~drivers-replace-pci_module_init-with-pci_register_driver-in-mm 2005-12-22 05:10:30.000000000 -0800 +++ devel-akpm/drivers/scsi/pata_triflex.c 2005-12-22 05:10:30.000000000 -0800 @@ -247,7 +247,7 @@ static struct pci_driver triflex_pci_dri static int __init triflex_init(void) { - return pci_module_init(&triflex_pci_driver); + return pci_register_driver(&triflex_pci_driver); } diff -puN drivers/scsi/pata_via.c~drivers-replace-pci_module_init-with-pci_register_driver-in-mm drivers/scsi/pata_via.c --- devel/drivers/scsi/pata_via.c~drivers-replace-pci_module_init-with-pci_register_driver-in-mm 2005-12-22 05:10:30.000000000 -0800 +++ devel-akpm/drivers/scsi/pata_via.c 2005-12-22 05:10:30.000000000 -0800 @@ -491,7 +491,7 @@ static struct pci_driver via_pci_driver static int __init via_init(void) { - return pci_module_init(&via_pci_driver); + return pci_register_driver(&via_pci_driver); } _