Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Henrik Kretzschmar and committed by
James Bottomley
dcbccbde 45223fd7

+10 -11
+1 -1
drivers/scsi/3w-9xxx.c
··· 2211 2211 { 2212 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 2215 } /* End twa_init() */ 2216 2216 2217 2217 /* This function is called on driver exit */
+1 -1
drivers/scsi/3w-xxxx.c
··· 2486 2486 { 2487 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 2490 } /* End tw_init() */ 2491 2491 2492 2492 /* This function is called on driver exit */
+1 -1
drivers/scsi/a100u2w.c
··· 1187 1187 1188 1188 static 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 1193 1193 static void __exit inia100_exit(void)
+1 -1
drivers/scsi/aic7xxx/aic79xx_osm_pci.c
··· 198 198 int 199 199 ahd_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 204 204 void
+1 -2
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
··· 246 246 int 247 247 ahc_linux_pci_init(void) 248 248 { 249 - /* Translate error or zero return into zero or one */ 250 - return pci_module_init(&aic7xxx_pci_driver) ? 0 : 1; 249 + return pci_register_driver(&aic7xxx_pci_driver); 251 250 } 252 251 253 252 void
+1 -1
drivers/scsi/dc395x.c
··· 4949 4949 **/ 4950 4950 static 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
+1 -1
drivers/scsi/dmx3191d.c
··· 155 155 156 156 static 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 161 161 static void __exit dmx3191d_exit(void)
+1 -1
drivers/scsi/ipr.c
··· 7396 7396 ipr_info("IBM Power RAID SCSI Device Driver version: %s %s\n", 7397 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 /**
+1 -1
drivers/scsi/nsp32.c
··· 3581 3581 */ 3582 3582 static int __init init_nsp32(void) { 3583 3583 nsp32_msg(KERN_INFO, "loading..."); 3584 - return pci_module_init(&nsp32_driver); 3584 + return pci_register_driver(&nsp32_driver); 3585 3585 } 3586 3586 3587 3587 static void __exit exit_nsp32(void) {
+1 -1
drivers/scsi/qla1280.c
··· 4484 4484 qla1280_setup(qla1280); 4485 4485 #endif 4486 4486 4487 - return pci_module_init(&qla1280_pci_driver); 4487 + return pci_register_driver(&qla1280_pci_driver); 4488 4488 } 4489 4489 4490 4490 static void __exit