[PATCH] PCI: remove pci_module_init() usage from drivers/pci/hotplug/*

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
index d4cd2ee27aeae0c52cbcf924bdfaf05413a573c1..e9928024be7841caebeee0d89c3d3ef3b46d44ca 100644 (file)
--- a/drivers/pci/hotplug/cpcihp_zt5550.c
+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
@@ -283,7 +283,7 @@ static int __init zt5550_init(void)
        if(!r)
                return -EBUSY;
 
-       return pci_module_init(&zt5550_hc_driver);
+       return pci_register_driver(&zt5550_hc_driver);
 }
 
 static void __exit

diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c
index 43c50434757a9e213da0ed1ee591cf2b9e9d2507..24e0699ab0aadf88c418c317905256a770652229 100644 (file)
--- a/drivers/pci/hotplug/cpqphp_core.c
+++ b/drivers/pci/hotplug/cpqphp_core.c
@@ -1487,8 +1487,8 @@ static int __init cpqhpc_init(void)
        cpqhp_debug = debug;
 
        info (DRIVER_DESC " version: " DRIVER_VERSION "\n");
-       result = pci_module_init(&cpqhpc_driver);
-       dbg("pci_module_init = %d\n", result);
+       result = pci_register_driver(&cpqhpc_driver);
+       dbg("pci_register_driver = %d\n", result);
        return result;
 }
 

diff --git a/drivers/pci/hotplug/ibmphp_ebda.c b/drivers/pci/hotplug/ibmphp_ebda.c
index 5b72db7cfdcf51a206e6fe9c620e18937f5c286b..aea1187c73ad3d0d9e8ddbc57284a8cb01d7462f 100644 (file)
--- a/drivers/pci/hotplug/ibmphp_ebda.c
+++ b/drivers/pci/hotplug/ibmphp_ebda.c
@@ -1246,7 +1246,7 @@ int ibmphp_register_pci (void)
        list_for_each (tmp, &ebda_hpc_head) {
                ctrl = list_entry (tmp, struct controller, ebda_hpc_list);
                if (ctrl->ctlr_type == 1) {
-                       rc = pci_module_init (&ibmphp_driver);
+                       rc = pci_register_driver(&ibmphp_driver);
                        break;
                }
        }

diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 9df420db24da7939fbe92848c8b1a42d87bd9ddb..0d1eb271f23a7983f90de8ccdb6e4e6a60edeaab 100644 (file)
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -602,8 +602,8 @@ static int __init pcied_init(void)
 
        retval = pciehprm_init(PCI);
        if (!retval) {
-               retval = pci_module_init(&pcie_driver);
-               dbg("pci_module_init = %d\n", retval);
+               retval = pci_register_driver(&pcie_driver);
+               dbg("pci_register_driver = %d\n", retval);
                info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
        }
 

diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c
index 4f7a11d87b272efea3d40c49456da39ee6aa0fc3..f11217230917db5571d94188296b1b45f31a2b45 100644 (file)
--- a/drivers/pci/hotplug/shpchp_core.c
+++ b/drivers/pci/hotplug/shpchp_core.c
@@ -599,8 +599,8 @@ static int __init shpcd_init(void)
 
        retval = shpchprm_init(PCI);
        if (!retval) {
-               retval = pci_module_init(&shpc_driver);
-               dbg("%s: pci_module_init = %d\n", __FUNCTION__, retval);
+               retval = pci_register_driver(&shpc_driver);
+               dbg("%s: pci_register_driver = %d\n", __FUNCTION__, retval);
                info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
        }