The patch titled
pci_module_init conversion in scsi subsystem
has been added to the -mm tree. Its filename is
pci_module_init-conversion-in-scsi-subsys-2nd-try.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: pci_module_init conversion in scsi subsystem
From: Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/scsi/3w-9xxx.c | 2 +-
drivers/scsi/3w-xxxx.c | 2 +-
drivers/scsi/a100u2w.c | 2 +-
drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 2 +-
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 3 +--
drivers/scsi/dc395x.c | 2 +-
drivers/scsi/dmx3191d.c | 2 +-
drivers/scsi/ipr.c | 2 +-
drivers/scsi/nsp32.c | 2 +-
drivers/scsi/pdc_adma.c | 2 +-
drivers/scsi/qla1280.c | 2 +-
drivers/scsi/sata_mv.c | 2 +-
drivers/scsi/sata_nv.c | 2 +-
drivers/scsi/sata_promise.c | 2 +-
drivers/scsi/sata_qstor.c | 2 +-
drivers/scsi/sata_sil.c | 2 +-
drivers/scsi/sata_sil24.c | 2 +-
drivers/scsi/sata_sis.c | 2 +-
drivers/scsi/sata_svw.c | 2 +-
drivers/scsi/sata_sx4.c | 2 +-
drivers/scsi/sata_uli.c | 2 +-
drivers/scsi/sata_via.c | 2 +-
drivers/scsi/sata_vsc.c | 2 +-
23 files changed, 23 insertions(+), 24 deletions(-)
diff -puN drivers/scsi/3w-9xxx.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/3w-9xxx.c
--- a/drivers/scsi/3w-9xxx.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/3w-9xxx.c
@@ -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 */
diff -puN drivers/scsi/3w-xxxx.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/3w-xxxx.c
--- a/drivers/scsi/3w-xxxx.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/3w-xxxx.c
@@ -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 */
diff -puN drivers/scsi/a100u2w.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/a100u2w.c
--- a/drivers/scsi/a100u2w.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/a100u2w.c
@@ -1187,7 +1187,7 @@ static struct pci_driver inia100_pci_dri
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)
diff -puN drivers/scsi/aic7xxx/aic79xx_osm_pci.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/aic7xxx/aic79xx_osm_pci.c
--- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
@@ -198,7 +198,7 @@ ahd_linux_pci_dev_probe(struct pci_dev *
int
ahd_linux_pci_init(void)
{
- return (pci_module_init(&aic79xx_pci_driver));
+ return pci_register_driver(&aic79xx_pci_driver);
}
void
diff -puN drivers/scsi/aic7xxx/aic7xxx_osm_pci.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
--- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
@@ -246,8 +246,7 @@ ahc_linux_pci_dev_probe(struct pci_dev *
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
diff -puN drivers/scsi/dc395x.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/dc395x.c
--- a/drivers/scsi/dc395x.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/dc395x.c
@@ -4949,7 +4949,7 @@ static struct pci_driver dc395x_driver =
**/
static int __init dc395x_module_init(void)
{
- return pci_module_init(&dc395x_driver);
+ return pci_register_driver(&dc395x_driver);
}
diff -puN drivers/scsi/dmx3191d.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/dmx3191d.c
--- a/drivers/scsi/dmx3191d.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/dmx3191d.c
@@ -155,7 +155,7 @@ static struct pci_driver dmx3191d_pci_dr
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)
diff -puN drivers/scsi/ipr.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/ipr.c
--- a/drivers/scsi/ipr.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/ipr.c
@@ -6721,7 +6721,7 @@ static int __init ipr_init(void)
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);
}
/**
diff -puN drivers/scsi/nsp32.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/nsp32.c
--- a/drivers/scsi/nsp32.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/nsp32.c
@@ -3581,7 +3581,7 @@ static struct pci_driver nsp32_driver =
*/
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) {
diff -puN drivers/scsi/pdc_adma.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/pdc_adma.c
--- a/drivers/scsi/pdc_adma.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/pdc_adma.c
@@ -721,7 +721,7 @@ err_out:
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)
diff -puN drivers/scsi/qla1280.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/qla1280.c
--- a/drivers/scsi/qla1280.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/qla1280.c
@@ -4484,7 +4484,7 @@ qla1280_init(void)
qla1280_setup(qla1280);
#endif
- return pci_module_init(&qla1280_pci_driver);
+ return pci_register_driver(&qla1280_pci_driver);
}
static void __exit
diff -puN drivers/scsi/sata_mv.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/sata_mv.c
--- a/drivers/scsi/sata_mv.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/sata_mv.c
@@ -2447,7 +2447,7 @@ err_out:
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)
diff -puN drivers/scsi/sata_nv.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/sata_nv.c
--- a/drivers/scsi/sata_nv.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/sata_nv.c
@@ -583,7 +583,7 @@ static void nv_ck804_host_stop(struct at
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)
diff -puN drivers/scsi/sata_promise.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/sata_promise.c
--- a/drivers/scsi/sata_promise.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/sata_promise.c
@@ -848,7 +848,7 @@ err_out:
static int __init pdc_ata_init(void)
{
- return pci_module_init(&pdc_ata_pci_driver);
+ return pci_register_driver(&pdc_ata_pci_driver);
}
diff -puN drivers/scsi/sata_qstor.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/sata_qstor.c
--- a/drivers/scsi/sata_qstor.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/sata_qstor.c
@@ -712,7 +712,7 @@ err_out:
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)
diff -puN drivers/scsi/sata_sil24.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/sata_sil24.c
--- a/drivers/scsi/sata_sil24.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/sata_sil24.c
@@ -1206,7 +1206,7 @@ static int sil24_pci_device_resume(struc
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)
diff -puN drivers/scsi/sata_sil.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/sata_sil.c
--- a/drivers/scsi/sata_sil.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/sata_sil.c
@@ -710,7 +710,7 @@ static int sil_pci_device_resume(struct
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)
diff -puN drivers/scsi/sata_sis.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/sata_sis.c
--- a/drivers/scsi/sata_sis.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/sata_sis.c
@@ -334,7 +334,7 @@ err_out:
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)
diff -puN drivers/scsi/sata_svw.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/sata_svw.c
--- a/drivers/scsi/sata_svw.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/sata_svw.c
@@ -488,7 +488,7 @@ static struct pci_driver k2_sata_pci_dri
static int __init k2_sata_init(void)
{
- return pci_module_init(&k2_sata_pci_driver);
+ return pci_register_driver(&k2_sata_pci_driver);
}
diff -puN drivers/scsi/sata_sx4.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/sata_sx4.c
--- a/drivers/scsi/sata_sx4.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/sata_sx4.c
@@ -1482,7 +1482,7 @@ err_out:
static int __init pdc_sata_init(void)
{
- return pci_module_init(&pdc_sata_pci_driver);
+ return pci_register_driver(&pdc_sata_pci_driver);
}
diff -puN drivers/scsi/sata_uli.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/sata_uli.c
--- a/drivers/scsi/sata_uli.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/sata_uli.c
@@ -287,7 +287,7 @@ err_out:
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)
diff -puN drivers/scsi/sata_via.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/sata_via.c
--- a/drivers/scsi/sata_via.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/sata_via.c
@@ -381,7 +381,7 @@ err_out:
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)
diff -puN drivers/scsi/sata_vsc.c~pci_module_init-conversion-in-scsi-subsys-2nd-try drivers/scsi/sata_vsc.c
--- a/drivers/scsi/sata_vsc.c~pci_module_init-conversion-in-scsi-subsys-2nd-try
+++ a/drivers/scsi/sata_vsc.c
@@ -462,7 +462,7 @@ static struct pci_driver vsc_sata_pci_dr
static int __init vsc_sata_init(void)
{
- return pci_module_init(&vsc_sata_pci_driver);
+ return pci_register_driver(&vsc_sata_pci_driver);
}
_
Patches currently in -mm which might be from henne@xxxxxxxxxxxxxxxx are
origin.patch
pci_module_init-conversion-in-scsi-subsys-2nd-try.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
