Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

drivers/scsi/3w-9xxx.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/scsi/3w-xxxx.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/scsi/a100u2w.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/scsi/aic7xxx/aic79xx_osm_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/scsi/aic7xxx/aic7xxx_osm_pci.c

+1 −2
Original line number Diff line number Diff line
@@ -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