Skip to contentSkip to conversation

pci_module_init conversion in scsi subsys

PATCH New Henne 1 participant 1 message Jul 18, 2006

Subsystems (9)
SCSI Kernel janitors AIC7XXX / AIC79XX SCSI driver IBM Power Linux RAID adapter +5 more subsystems
lore
Share & tools
lore

Henne

author
#0 lore raw

PATCH 1/1 pci_module_init conversion in scsi subsys

From: Henrik Kretzschmar <[email protected]>

Converts pci_module_init() to pci_register_driver() in the scsi subsys on 23 drivers which only return the value of pci_module_init(). All other drivers do something with that return value and may require a closer look before that change.

Signed-off-by Henrik Kretzschmar <[email protected]>

---

drivers/scsi/3w-9xxx.c +1 -1
diff -ruN linux-2.6.18-rc2/drivers/scsi/3w-9xxx.c linux/drivers/scsi/3w-9xxx.c
@@ -2211,7 +2211,7 @@
 {
 	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 */
drivers/scsi/3w-xxxx.c +1 -1
diff -ruN linux-2.6.18-rc2/drivers/scsi/3w-xxxx.c linux/drivers/scsi/3w-xxxx.c
@@ -2486,7 +2486,7 @@
 {
 	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 */
drivers/scsi/a100u2w.c +1 -1
diff -ruN linux-2.6.18-rc2/drivers/scsi/a100u2w.c linux/drivers/scsi/a100u2w.c
@@ -1187,7 +1187,7 @@
 
 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)
drivers/scsi/aic7xxx/aic79xx_osm_pci.c +1 -1
diff -ruN linux-2.6.18-rc2/drivers/scsi/aic7xxx/aic79xx_osm_pci.c linux/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
@@ -198,7 +198,7 @@
 int
 ahd_linux_pci_init(void)
 {
-	return (pci_module_init(&aic79xx_pci_driver));
+	return pci_register_driver(&aic79xx_pci_driver);
 }
 
 void
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c +1 -2
diff -ruN linux-2.6.18-rc2/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c linux/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
@@ -246,8 +246,7 @@
 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
drivers/scsi/dc395x.c +1 -1
diff -ruN linux-2.6.18-rc2/drivers/scsi/dc395x.c linux/drivers/scsi/dc395x.c
@@ -4949,7 +4949,7 @@
  **/
 static int __init dc395x_module_init(void)
 {
-	return pci_module_init(&dc395x_driver);
+	return pci_register_driver(&dc395x_driver);
 }
drivers/scsi/dmx3191d.c +1 -1
diff -ruN linux-2.6.18-rc2/drivers/scsi/dmx3191d.c linux/drivers/scsi/dmx3191d.c
@@ -155,7 +155,7 @@
 
 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)
drivers/scsi/ipr.c +1 -1
diff -ruN linux-2.6.18-rc2/drivers/scsi/ipr.c linux/drivers/scsi/ipr.c
@@ -6721,7 +6721,7 @@
 	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);
 }
 
 /**
drivers/scsi/nsp32.c +1 -1
diff -ruN linux-2.6.18-rc2/drivers/scsi/nsp32.c linux/drivers/scsi/nsp32.c
@@ -3581,7 +3581,7 @@
  */
 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) {
drivers/scsi/pdc_adma.c +1 -1
diff -ruN linux-2.6.18-rc2/drivers/scsi/pdc_adma.c linux/drivers/scsi/pdc_adma.c
@@ -721,7 +721,7 @@
 
 static int __init adma_ata_init(void)
 {
-	return pci_module_init(&adma_ata_pci_driver);
+	return pci_register_driver(&adma_ata_pci_driver);
 }
 
 static void __exit adma_ata_exit(void)
drivers/scsi/qla1280.c +1 -1
diff -ruN linux-2.6.18-rc2/drivers/scsi/qla1280.c linux/drivers/scsi/qla1280.c
@@ -4484,7 +4484,7 @@
 		qla1280_setup(qla1280);
 #endif
 
-	return pci_module_init(&qla1280_pci_driver);
+	return pci_register_driver(&qla1280_pci_driver);
 }
 
 static void __exit
drivers/scsi/sata_mv.c +1 -1
diff -ruN linux-2.6.18-rc2/drivers/scsi/sata_mv.c linux/drivers/scsi/sata_mv.c
@@ -2447,7 +2447,7 @@
 
 static int __init mv_init(void)
 {
-	return pci_module_init(&mv_pci_driver);
+	return pci_register_driver(&mv_pci_driver);
 }
 
 static void __exit mv_exit(void)
drivers/scsi/sata_nv.c +1 -1
diff -ruN linux-2.6.18-rc2/drivers/scsi/sata_nv.c linux/drivers/scsi/sata_nv.c
@@ -583,7 +583,7 @@
 
 static int __init nv_init(void)
 {
-	return pci_module_init(&nv_pci_driver);
+	return pci_register_driver(&nv_pci_driver);
 }
 
 static void __exit nv_exit(void)
drivers/scsi/sata_promise.c +1 -1
diff -ruN linux-2.6.18-rc2/drivers/scsi/sata_promise.c linux/drivers/scsi/sata_promise.c
@@ -817,7 +817,7 @@
 
 static int __init pdc_ata_init(void)
 {
-	return pci_module_init(&pdc_ata_pci_driver);
+	return pci_register_driver(&pdc_ata_pci_driver);
 }
drivers/scsi/sata_qstor.c +1 -1
diff -ruN linux-2.6.18-rc2/drivers/scsi/sata_qstor.c linux/drivers/scsi/sata_qstor.c
@@ -712,7 +712,7 @@
 
 static int __init qs_ata_init(void)
 {
-	return pci_module_init(&qs_ata_pci_driver);
+	return pci_register_driver(&qs_ata_pci_driver);
 }
 
 static void __exit qs_ata_exit(void)
drivers/scsi/sata_sil24.c +1 -1
diff -ruN linux-2.6.18-rc2/drivers/scsi/sata_sil24.c linux/drivers/scsi/sata_sil24.c
@@ -1206,7 +1206,7 @@
 
 static int __init sil24_init(void)
 {
-	return pci_module_init(&sil24_pci_driver);
+	return pci_register_driver(&sil24_pci_driver);
 }
 
 static void __exit sil24_exit(void)
drivers/scsi/sata_sil.c +1 -1
diff -ruN linux-2.6.18-rc2/drivers/scsi/sata_sil.c linux/drivers/scsi/sata_sil.c
@@ -714,7 +714,7 @@
 
 static int __init sil_init(void)
 {
-	return pci_module_init(&sil_pci_driver);
+	return pci_register_driver(&sil_pci_driver);
 }
 
 static void __exit sil_exit(void)
drivers/scsi/sata_sis.c +1 -1
diff -ruN linux-2.6.18-rc2/drivers/scsi/sata_sis.c linux/drivers/scsi/sata_sis.c
@@ -334,7 +334,7 @@
 
 static int __init sis_init(void)
 {
-	return pci_module_init(&sis_pci_driver);
+	return pci_register_driver(&sis_pci_driver);
 }
 
 static void __exit sis_exit(void)
drivers/scsi/sata_svw.c +1 -1
diff -ruN linux-2.6.18-rc2/drivers/scsi/sata_svw.c linux/drivers/scsi/sata_svw.c
@@ -488,7 +488,7 @@
 
 static int __init k2_sata_init(void)
 {
-	return pci_module_init(&k2_sata_pci_driver);
+	return pci_register_driver(&k2_sata_pci_driver);
 }
drivers/scsi/sata_sx4.c +1 -1
diff -ruN linux-2.6.18-rc2/drivers/scsi/sata_sx4.c linux/drivers/scsi/sata_sx4.c
@@ -1482,7 +1482,7 @@
 
 static int __init pdc_sata_init(void)
 {
-	return pci_module_init(&pdc_sata_pci_driver);
+	return pci_register_driver(&pdc_sata_pci_driver);
 }
drivers/scsi/sata_uli.c +1 -1
diff -ruN linux-2.6.18-rc2/drivers/scsi/sata_uli.c linux/drivers/scsi/sata_uli.c
@@ -287,7 +287,7 @@
 
 static int __init uli_init(void)
 {
-	return pci_module_init(&uli_pci_driver);
+	return pci_register_driver(&uli_pci_driver);
 }
 
 static void __exit uli_exit(void)
drivers/scsi/sata_via.c +1 -1
diff -ruN linux-2.6.18-rc2/drivers/scsi/sata_via.c linux/drivers/scsi/sata_via.c
@@ -381,7 +381,7 @@
 
 static int __init svia_init(void)
 {
-	return pci_module_init(&svia_pci_driver);
+	return pci_register_driver(&svia_pci_driver);
 }
 
 static void __exit svia_exit(void)
drivers/scsi/sata_vsc.c +1 -1
diff -ruN linux-2.6.18-rc2/drivers/scsi/sata_vsc.c linux/drivers/scsi/sata_vsc.c
@@ -462,7 +462,7 @@
 
 static int __init vsc_sata_init(void)
 {
-	return pci_module_init(&vsc_sata_pci_driver);
+	return pci_register_driver(&vsc_sata_pci_driver);
 }