libata: replace pci_module_init() with pci_register_driver()
PATCH 1/1 libata: replace pci_module_init() with pci_register_driver()
From: Pavel Roskin <[email protected]>
Replace pci_module_init() with pci_register_driver().
---
This patch is against
upstream (3f066887595de490c411762ce58a31412b09e939)
+ improve-init-and-legacy-handling patchset, take #3
(http://article.gmane.org/gmane.linux.ide/12556)
And avaliable in the following git tree.
http://htj.dyndns.org/git/?p=libata-tj.git;a=shortlog;h=tj-upstream-pci_register_driver
git://htj.dyndns.org/libata-tj tj-upstream-pci_register_driver
#pata-drivers and #ALL are updated accordingly and available at...
http://htj.dyndns.org/git/?p=libata-tj.git;a=shortlog;h=tj-pata-drivers-pci_register_driver
git://htj.dyndns.org/libata-tj tj-pata-drivers-pci_register_driver
http://htj.dyndns.org/git/?p=libata-tj.git;a=shortlog;h=tj-ALL-pci_register_driver
git://htj.dyndns.org/libata-tj tj-ALL-pci_register_driver
Thanks.
drivers/scsi/ahci.c | 2 +- drivers/scsi/ata_piix.c | 4 ++-- drivers/scsi/pdc_adma.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 +- 15 files changed, 16 insertions(+), 16 deletions(-)
b7887196e38da54ff893897b80875d632d1a1114
drivers/scsi/ahci.c +1 -1
@@ -1665,7 +1665,7 @@ static void ahci_remove_one (struct pci_static int __init ahci_init (void ) { -return pci_module_init (&ahci_pci_driver); +return pci_register_driver (&ahci_pci_driver); } static void __exit ahci_exit(void)
drivers/scsi/ata_piix.c +2 -2
@@ -939,8 +939,8 @@ static int __init piix_init(void) {int rc; -DPRINTK ("pci_module_init\n" ); - rc =pci_module_init (&piix_pci_driver); +DPRINTK ("pci_register_driver\n" ); + rc =pci_register_driver (&piix_pci_driver);if (rc)return rc;
drivers/scsi/pdc_adma.c +1 -1
@@ -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)
drivers/scsi/sata_mv.c +1 -1
@@ -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)
drivers/scsi/sata_nv.c +1 -1
@@ -583,7 +583,7 @@ static void nv_ck804_host_stop(struct atstatic 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
@@ -824,7 +824,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); }
drivers/scsi/sata_qstor.c +1 -1
@@ -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)
drivers/scsi/sata_sil.c +1 -1
@@ -714,7 +714,7 @@ static int sil_pci_device_resume(structstatic 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_sil24.c +1 -1
@@ -1205,7 +1205,7 @@ static int sil24_pci_device_resume(strucstatic 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_sis.c +1 -1
@@ -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)
drivers/scsi/sata_svw.c +1 -1
@@ -488,7 +488,7 @@ static struct pci_driver k2_sata_pci_dristatic 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
@@ -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); }
drivers/scsi/sata_uli.c +1 -1
@@ -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)
drivers/scsi/sata_via.c +1 -1
@@ -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)
drivers/scsi/sata_vsc.c +1 -1
@@ -462,7 +462,7 @@ static struct pci_driver vsc_sata_pci_drstatic int __init vsc_sata_init (void ) { -return pci_module_init (&vsc_sata_pci_driver); +return pci_register_driver (&vsc_sata_pci_driver); }
Signature · 1 line
1.3.2
Quoted 11 lines · Tejun Heo
From: Pavel Roskin <[email protected]>
Replace
pci_module_init()withpci_register_driver().Signed-off-by Pavel Roskin <[email protected]>Signed-off-by Tejun Heo <[email protected]>---
This patch is against
Quoted 8 lines
upstream (
3f066887595de490c411762ce58a31412b09e939)
+ improve-init-and-legacy-handling patchset, take #3
(http://article.gmane.org/gmane.linux.ide/12556)And avaliable in the following git tree.
http://htj.dyndns.org/git/?p=libata-tj.git;a=shortlog;h=tj-upstream-pci_register_driver
git://htj.dyndns.org/libata-tjtj-upstream-pci_register_driver
FWIW, it is actually better to -not- stack patchsets in this way.
git merging enables parallel branches. Since pci-register-driver changes are completely unrelated to the improve-init-and-legacy-handling patchset, it would make sense to have that in an independent branch.
Anyway, this is not an acceptance or rejection comment (I plan to merge it). Just a comment. :)
Jeff
Quoted 21 lines · Jeff Garzik
Quoted 20 lines · Tejun Heo
From: Pavel Roskin <[email protected]>
Replace
pci_module_init()withpci_register_driver().Signed-off-by Pavel Roskin <[email protected]>Signed-off-by Tejun Heo <[email protected]>---
This patch is against
upstream (
3f066887595de490c411762ce58a31412b09e939)
+ improve-init-and-legacy-handling patchset, take #3
(http://article.gmane.org/gmane.linux.ide/12556)And avaliable in the following git tree.
http://htj.dyndns.org/git/?p=libata-tj.git;a=shortlog;h=tj-upstream-pci_register_driver
Quoted 7 lines
Quoted 1 line
git://htj.dyndns.org/libata-tjtj-upstream-pci_register_driverFWIW, it is actually better to -not- stack patchsets in this way.
git merging enables parallel branches. Since pci-register-driver changes are completely unrelated to the improve-init-and-legacy-handling patchset, it would make sense to have that in an independent branch.
Anyway, this is not an acceptance or rejection comment (I plan to merge it). Just a comment. :)
Thanks, will do things that way.
Signature · 1 line
tejun
Quoted 11 lines · Tejun Heo
From: Pavel Roskin <[email protected]>
Replace
pci_module_init()withpci_register_driver().Signed-off-by Pavel Roskin <[email protected]>Signed-off-by Tejun Heo <[email protected]>---
This patch is against
Quoted 8 lines
upstream (
3f066887595de490c411762ce58a31412b09e939)
+ improve-init-and-legacy-handling patchset, take #3
(http://article.gmane.org/gmane.linux.ide/12556)And avaliable in the following git tree.
http://htj.dyndns.org/git/?p=libata-tj.git;a=shortlog;h=tj-upstream-pci_register_driver
git://htj.dyndns.org/libata-tjtj-upstream-pci_register_driver
pulled
Quoted 4 lines
#pata-drivers and #ALL are updated accordingly and available at...
http://htj.dyndns.org/git/?p=libata-tj.git;a=shortlog;h=tj-pata-drivers-pci_register_driver
git://htj.dyndns.org/libata-tjtj-pata-drivers-pci_register_driver
choked on ata_generic and pata_pdc2027x, not pulled