aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Kretzschmar <henne@nachtwindheim.de>2006-09-25 19:58:58 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-09-26 14:35:32 -0400
commitdcbccbde00b85b4d4a1c206b419e7a3d2ab2b1cd (patch)
tree5abc8a69a32a4a11da0bbbda60d9b18e0300cbfb
parent45223fd77c2b39d05dd7f1aaabf614abb1770bbe (diff)
[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>
-rw-r--r--drivers/scsi/3w-9xxx.c2
-rw-r--r--drivers/scsi/3w-xxxx.c2
-rw-r--r--drivers/scsi/a100u2w.c2
-rw-r--r--drivers/scsi/aic7xxx/aic79xx_osm_pci.c2
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx_osm_pci.c3
-rw-r--r--drivers/scsi/dc395x.c2
-rw-r--r--drivers/scsi/dmx3191d.c2
-rw-r--r--drivers/scsi/ipr.c2
-rw-r--r--drivers/scsi/nsp32.c2
-rw-r--r--drivers/scsi/qla1280.c2
10 files changed, 10 insertions, 11 deletions
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index 5a9475e56d0e..da173159cedb 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -2211,7 +2211,7 @@ static int __init twa_init(void)
2211{ 2211{
2212 printk(KERN_WARNING "3ware 9000 Storage Controller device driver for Linux v%s.\n", TW_DRIVER_VERSION); 2212 printk(KERN_WARNING "3ware 9000 Storage Controller device driver for Linux v%s.\n", TW_DRIVER_VERSION);
2213 2213
2214 return pci_module_init(&twa_driver); 2214 return pci_register_driver(&twa_driver);
2215} /* End twa_init() */ 2215} /* End twa_init() */
2216 2216
2217/* This function is called on driver exit */ 2217/* This function is called on driver exit */
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index f3a5f422a8e4..2d4cb6721fa6 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -2486,7 +2486,7 @@ static int __init tw_init(void)
2486{ 2486{
2487 printk(KERN_WARNING "3ware Storage Controller device driver for Linux v%s.\n", TW_DRIVER_VERSION); 2487 printk(KERN_WARNING "3ware Storage Controller device driver for Linux v%s.\n", TW_DRIVER_VERSION);
2488 2488
2489 return pci_module_init(&tw_driver); 2489 return pci_register_driver(&tw_driver);
2490} /* End tw_init() */ 2490} /* End tw_init() */
2491 2491
2492/* This function is called on driver exit */ 2492/* This function is called on driver exit */
diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index d7e9fab54c60..2684150917e6 100644
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -1187,7 +1187,7 @@ static struct pci_driver inia100_pci_driver = {
1187 1187
1188static int __init inia100_init(void) 1188static int __init inia100_init(void)
1189{ 1189{
1190 return pci_module_init(&inia100_pci_driver); 1190 return pci_register_driver(&inia100_pci_driver);
1191} 1191}
1192 1192
1193static void __exit inia100_exit(void) 1193static void __exit inia100_exit(void)
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
index 50a41eda580e..4b5354201807 100644
--- 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)
198int 198int
199ahd_linux_pci_init(void) 199ahd_linux_pci_init(void)
200{ 200{
201 return (pci_module_init(&aic79xx_pci_driver)); 201 return pci_register_driver(&aic79xx_pci_driver);
202} 202}
203 203
204void 204void
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
index 7e42f07a27f3..d20ca514e9f3 100644
--- 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)
246int 246int
247ahc_linux_pci_init(void) 247ahc_linux_pci_init(void)
248{ 248{
249 /* Translate error or zero return into zero or one */ 249 return pci_register_driver(&aic7xxx_pci_driver);
250 return pci_module_init(&aic7xxx_pci_driver) ? 0 : 1;
251} 250}
252 251
253void 252void
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c
index 9d7048176e77..c6118d99385e 100644
--- a/drivers/scsi/dc395x.c
+++ b/drivers/scsi/dc395x.c
@@ -4949,7 +4949,7 @@ static struct pci_driver dc395x_driver = {
4949 **/ 4949 **/
4950static int __init dc395x_module_init(void) 4950static int __init dc395x_module_init(void)
4951{ 4951{
4952 return pci_module_init(&dc395x_driver); 4952 return pci_register_driver(&dc395x_driver);
4953} 4953}
4954 4954
4955 4955
diff --git a/drivers/scsi/dmx3191d.c b/drivers/scsi/dmx3191d.c
index 879a26657676..fa738ec8692a 100644
--- a/drivers/scsi/dmx3191d.c
+++ b/drivers/scsi/dmx3191d.c
@@ -155,7 +155,7 @@ static struct pci_driver dmx3191d_pci_driver = {
155 155
156static int __init dmx3191d_init(void) 156static int __init dmx3191d_init(void)
157{ 157{
158 return pci_module_init(&dmx3191d_pci_driver); 158 return pci_register_driver(&dmx3191d_pci_driver);
159} 159}
160 160
161static void __exit dmx3191d_exit(void) 161static void __exit dmx3191d_exit(void)
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index e1e3a0cb88e3..2e21e162056a 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -7396,7 +7396,7 @@ static int __init ipr_init(void)
7396 ipr_info("IBM Power RAID SCSI Device Driver version: %s %s\n", 7396 ipr_info("IBM Power RAID SCSI Device Driver version: %s %s\n",
7397 IPR_DRIVER_VERSION, IPR_DRIVER_DATE); 7397 IPR_DRIVER_VERSION, IPR_DRIVER_DATE);
7398 7398
7399 return pci_module_init(&ipr_driver); 7399 return pci_register_driver(&ipr_driver);
7400} 7400}
7401 7401
7402/** 7402/**
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index bfb4f49e125d..1c624ce81897 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -3581,7 +3581,7 @@ static struct pci_driver nsp32_driver = {
3581 */ 3581 */
3582static int __init init_nsp32(void) { 3582static int __init init_nsp32(void) {
3583 nsp32_msg(KERN_INFO, "loading..."); 3583 nsp32_msg(KERN_INFO, "loading...");
3584 return pci_module_init(&nsp32_driver); 3584 return pci_register_driver(&nsp32_driver);
3585} 3585}
3586 3586
3587static void __exit exit_nsp32(void) { 3587static void __exit exit_nsp32(void) {
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 2747c8e02f83..bdecde1c515f 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -4484,7 +4484,7 @@ qla1280_init(void)
4484 qla1280_setup(qla1280); 4484 qla1280_setup(qla1280);
4485#endif 4485#endif
4486 4486
4487 return pci_module_init(&qla1280_pci_driver); 4487 return pci_register_driver(&qla1280_pci_driver);
4488} 4488}
4489 4489
4490static void __exit 4490static void __exit