[SCSI] pci_module_init conversion in scsi subsystem

Converts pci_module_init() to pci_register_driver() in the scsi subsys on
23 drivers which only return the value of pci_module_init().

Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index 5a9475e56d0eb7baea0b33d0188787aaffb799c0..da173159cedbcec2ff43267b237c7e41514f5bd0 100644 (file)
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -2211,7 +2211,7 @@ static int __init twa_init(void)
 {
        printk(KERN_WARNING "3ware 9000 Storage Controller device driver for Linux v%s.\n", TW_DRIVER_VERSION);
 
-       return pci_module_init(&twa_driver);
+       return pci_register_driver(&twa_driver);
 } /* End twa_init() */
 
 /* This function is called on driver exit */

diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index f3a5f422a8e4d5f11f636a5c5ef798d239b82392..2d4cb6721fa6688132446f4e4b12772e7f55d77f 100644 (file)
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -2486,7 +2486,7 @@ static int __init tw_init(void)
 {
        printk(KERN_WARNING "3ware Storage Controller device driver for Linux v%s.\n", TW_DRIVER_VERSION);
 
-       return pci_module_init(&tw_driver);
+       return pci_register_driver(&tw_driver);
 } /* End tw_init() */
 
 /* This function is called on driver exit */

diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index d7e9fab54c60eb5a4ff1ae6505ecc72b1b702311..2684150917e690e033d9fc27d91087f09ba5bc6e 100644 (file)
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -1187,7 +1187,7 @@ static struct pci_driver inia100_pci_driver = {
 
 static int __init inia100_init(void)
 {
-       return pci_module_init(&inia100_pci_driver);
+       return pci_register_driver(&inia100_pci_driver);
 }
 
 static void __exit inia100_exit(void)

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
index 50a41eda580eb4daebac5be164fa8db2f8c8ebc2..4b53542018073c3dd1bd17f003648cbbc451d9e5 100644 (file)
--- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
@@ -198,7 +198,7 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 int
 ahd_linux_pci_init(void)
 {
-       return (pci_module_init(&aic79xx_pci_driver));
+       return pci_register_driver(&aic79xx_pci_driver);
 }
 
 void

diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
index 7e42f07a27f3d2879aec66a395f6504afe6a6fb0..d20ca514e9f36f11ba120dbe132338fa9c7f8ce6 100644 (file)
--- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
@@ -246,8 +246,7 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 int
 ahc_linux_pci_init(void)
 {
-       /* Translate error or zero return into zero or one */
-       return pci_module_init(&aic7xxx_pci_driver) ? 0 : 1;
+       return pci_register_driver(&aic7xxx_pci_driver);
 }
 
 void

diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c
index 9d7048176e77dbab277cd67d45ba19ed4020cd45..c6118d99385e8d711939c93fc679995b48d36c1c 100644 (file)
--- a/drivers/scsi/dc395x.c
+++ b/drivers/scsi/dc395x.c
@@ -4949,7 +4949,7 @@ static struct pci_driver dc395x_driver = {
  **/
 static int __init dc395x_module_init(void)
 {
-       return pci_module_init(&dc395x_driver);
+       return pci_register_driver(&dc395x_driver);
 }
 
 

diff --git a/drivers/scsi/dmx3191d.c b/drivers/scsi/dmx3191d.c
index 879a2665767611dc6749df5111f6d3b6341c6ee1..fa738ec8692a24d2882901cf2d6c618a3eb05e6a 100644 (file)
--- a/drivers/scsi/dmx3191d.c
+++ b/drivers/scsi/dmx3191d.c
@@ -155,7 +155,7 @@ static struct pci_driver dmx3191d_pci_driver = {
 
 static int __init dmx3191d_init(void)
 {
-       return pci_module_init(&dmx3191d_pci_driver);
+       return pci_register_driver(&dmx3191d_pci_driver);
 }
 
 static void __exit dmx3191d_exit(void)

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index e1e3a0cb88e3c480d6a15c21ac8c88982cd42106..2e21e162056abbd465828188364a6939f1a54926 100644 (file)
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -7396,7 +7396,7 @@ static int __init ipr_init(void)
        ipr_info("IBM Power RAID SCSI Device Driver version: %s %s\n",
                 IPR_DRIVER_VERSION, IPR_DRIVER_DATE);
 
-       return pci_module_init(&ipr_driver);
+       return pci_register_driver(&ipr_driver);
 }
 
 /**

diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index bfb4f49e125d28b82a5dea1472641c1d43e45339..1c624ce8189761595acb49b4d2dcea049d95fd75 100644 (file)
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -3581,7 +3581,7 @@ static struct pci_driver nsp32_driver = {
  */
 static int __init init_nsp32(void) {
        nsp32_msg(KERN_INFO, "loading...");
-       return pci_module_init(&nsp32_driver);
+       return pci_register_driver(&nsp32_driver);
 }
 
 static void __exit exit_nsp32(void) {

diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 2747c8e02f83b515e996da730b88b6a0b595d50b..bdecde1c515f7c48f71b335fa781c9cbe0f7d4ec 100644 (file)
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -4484,7 +4484,7 @@ qla1280_init(void)
                qla1280_setup(qla1280);
 #endif
 
-       return pci_module_init(&qla1280_pci_driver);
+       return pci_register_driver(&qla1280_pci_driver);
 }
 
 static void __exit