Commit dcbccbde authored by Henrik Kretzschmar's avatar Henrik Kretzschmar Committed by James Bottomley

[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: default avatarHenrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 45223fd7
...@@ -2211,7 +2211,7 @@ static int __init twa_init(void) ...@@ -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); 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() */ } /* End twa_init() */
/* This function is called on driver exit */ /* This function is called on driver exit */
......
...@@ -2486,7 +2486,7 @@ static int __init tw_init(void) ...@@ -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); 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() */ } /* End tw_init() */
/* This function is called on driver exit */ /* This function is called on driver exit */
......
...@@ -1187,7 +1187,7 @@ static struct pci_driver inia100_pci_driver = { ...@@ -1187,7 +1187,7 @@ static struct pci_driver inia100_pci_driver = {
static int __init inia100_init(void) 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) static void __exit inia100_exit(void)
......
...@@ -198,7 +198,7 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -198,7 +198,7 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
int int
ahd_linux_pci_init(void) ahd_linux_pci_init(void)
{ {
return (pci_module_init(&aic79xx_pci_driver)); return pci_register_driver(&aic79xx_pci_driver);
} }
void void
......
...@@ -246,8 +246,7 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -246,8 +246,7 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
int int
ahc_linux_pci_init(void) ahc_linux_pci_init(void)
{ {
/* Translate error or zero return into zero or one */ return pci_register_driver(&aic7xxx_pci_driver);
return pci_module_init(&aic7xxx_pci_driver) ? 0 : 1;
} }
void void
......
...@@ -4949,7 +4949,7 @@ static struct pci_driver dc395x_driver = { ...@@ -4949,7 +4949,7 @@ static struct pci_driver dc395x_driver = {
**/ **/
static int __init dc395x_module_init(void) static int __init dc395x_module_init(void)
{ {
return pci_module_init(&dc395x_driver); return pci_register_driver(&dc395x_driver);
} }
......
...@@ -155,7 +155,7 @@ static struct pci_driver dmx3191d_pci_driver = { ...@@ -155,7 +155,7 @@ static struct pci_driver dmx3191d_pci_driver = {
static int __init dmx3191d_init(void) 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) static void __exit dmx3191d_exit(void)
......
...@@ -7396,7 +7396,7 @@ static int __init ipr_init(void) ...@@ -7396,7 +7396,7 @@ static int __init ipr_init(void)
ipr_info("IBM Power RAID SCSI Device Driver version: %s %s\n", ipr_info("IBM Power RAID SCSI Device Driver version: %s %s\n",
IPR_DRIVER_VERSION, IPR_DRIVER_DATE); IPR_DRIVER_VERSION, IPR_DRIVER_DATE);
return pci_module_init(&ipr_driver); return pci_register_driver(&ipr_driver);
} }
/** /**
......
...@@ -3581,7 +3581,7 @@ static struct pci_driver nsp32_driver = { ...@@ -3581,7 +3581,7 @@ static struct pci_driver nsp32_driver = {
*/ */
static int __init init_nsp32(void) { static int __init init_nsp32(void) {
nsp32_msg(KERN_INFO, "loading..."); nsp32_msg(KERN_INFO, "loading...");
return pci_module_init(&nsp32_driver); return pci_register_driver(&nsp32_driver);
} }
static void __exit exit_nsp32(void) { static void __exit exit_nsp32(void) {
......
...@@ -4484,7 +4484,7 @@ qla1280_init(void) ...@@ -4484,7 +4484,7 @@ qla1280_init(void)
qla1280_setup(qla1280); qla1280_setup(qla1280);
#endif #endif
return pci_module_init(&qla1280_pci_driver); return pci_register_driver(&qla1280_pci_driver);
} }
static void __exit static void __exit
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment