aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorPavel Roskin <proski@gnu.org>2006-08-10 05:13:18 -0400
committerTejun Heo <htejun@gmail.com>2006-08-10 05:13:18 -0400
commitb7887196e38da54ff893897b80875d632d1a1114 (patch)
tree6cba2112e9058fc67f30edab5baa0fc606b61115 /drivers/scsi
parent4852ba24f647199be797545226c6d325db231937 (diff)
[PATCH] libata: replace pci_module_init() with pci_register_driver()
Replace pci_module_init() with pci_register_driver(). Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/ahci.c2
-rw-r--r--drivers/scsi/ata_piix.c4
-rw-r--r--drivers/scsi/pdc_adma.c2
-rw-r--r--drivers/scsi/sata_mv.c2
-rw-r--r--drivers/scsi/sata_nv.c2
-rw-r--r--drivers/scsi/sata_promise.c2
-rw-r--r--drivers/scsi/sata_qstor.c2
-rw-r--r--drivers/scsi/sata_sil.c2
-rw-r--r--drivers/scsi/sata_sil24.c2
-rw-r--r--drivers/scsi/sata_sis.c2
-rw-r--r--drivers/scsi/sata_svw.c2
-rw-r--r--drivers/scsi/sata_sx4.c2
-rw-r--r--drivers/scsi/sata_uli.c2
-rw-r--r--drivers/scsi/sata_via.c2
-rw-r--r--drivers/scsi/sata_vsc.c2
15 files changed, 16 insertions, 16 deletions
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 68fd7667a082..813031c01fba 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -1665,7 +1665,7 @@ static void ahci_remove_one (struct pci_dev *pdev)
1665 1665
1666static int __init ahci_init(void) 1666static int __init ahci_init(void)
1667{ 1667{
1668 return pci_module_init(&ahci_pci_driver); 1668 return pci_register_driver(&ahci_pci_driver);
1669} 1669}
1670 1670
1671static void __exit ahci_exit(void) 1671static void __exit ahci_exit(void)
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index 501755a606ed..46c34fd5af8f 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -939,8 +939,8 @@ static int __init piix_init(void)
939{ 939{
940 int rc; 940 int rc;
941 941
942 DPRINTK("pci_module_init\n"); 942 DPRINTK("pci_register_driver\n");
943 rc = pci_module_init(&piix_pci_driver); 943 rc = pci_register_driver(&piix_pci_driver);
944 if (rc) 944 if (rc)
945 return rc; 945 return rc;
946 946
diff --git a/drivers/scsi/pdc_adma.c b/drivers/scsi/pdc_adma.c
index d1f38c32aa15..6b7b62408e44 100644
--- a/drivers/scsi/pdc_adma.c
+++ b/drivers/scsi/pdc_adma.c
@@ -721,7 +721,7 @@ err_out:
721 721
722static int __init adma_ata_init(void) 722static int __init adma_ata_init(void)
723{ 723{
724 return pci_module_init(&adma_ata_pci_driver); 724 return pci_register_driver(&adma_ata_pci_driver);
725} 725}
726 726
727static void __exit adma_ata_exit(void) 727static void __exit adma_ata_exit(void)
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
index 1053c7c76b7d..a2915a56accd 100644
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -2447,7 +2447,7 @@ err_out:
2447 2447
2448static int __init mv_init(void) 2448static int __init mv_init(void)
2449{ 2449{
2450 return pci_module_init(&mv_pci_driver); 2450 return pci_register_driver(&mv_pci_driver);
2451} 2451}
2452 2452
2453static void __exit mv_exit(void) 2453static void __exit mv_exit(void)
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
index 56da25581f31..be46df75ab5a 100644
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
@@ -583,7 +583,7 @@ static void nv_ck804_host_stop(struct ata_host_set *host_set)
583 583
584static int __init nv_init(void) 584static int __init nv_init(void)
585{ 585{
586 return pci_module_init(&nv_pci_driver); 586 return pci_register_driver(&nv_pci_driver);
587} 587}
588 588
589static void __exit nv_exit(void) 589static void __exit nv_exit(void)
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index 4776f4e55839..a5b3a7db7a9f 100644
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
@@ -824,7 +824,7 @@ err_out:
824 824
825static int __init pdc_ata_init(void) 825static int __init pdc_ata_init(void)
826{ 826{
827 return pci_module_init(&pdc_ata_pci_driver); 827 return pci_register_driver(&pdc_ata_pci_driver);
828} 828}
829 829
830 830
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c
index d374c1db0cf3..71bd6712b377 100644
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@ -712,7 +712,7 @@ err_out:
712 712
713static int __init qs_ata_init(void) 713static int __init qs_ata_init(void)
714{ 714{
715 return pci_module_init(&qs_ata_pci_driver); 715 return pci_register_driver(&qs_ata_pci_driver);
716} 716}
717 717
718static void __exit qs_ata_exit(void) 718static void __exit qs_ata_exit(void)
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index d0a85073ebf7..2393379b2398 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -714,7 +714,7 @@ static int sil_pci_device_resume(struct pci_dev *pdev)
714 714
715static int __init sil_init(void) 715static int __init sil_init(void)
716{ 716{
717 return pci_module_init(&sil_pci_driver); 717 return pci_register_driver(&sil_pci_driver);
718} 718}
719 719
720static void __exit sil_exit(void) 720static void __exit sil_exit(void)
diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c
index 3f368c7d3ef9..3a0161ddc33f 100644
--- a/drivers/scsi/sata_sil24.c
+++ b/drivers/scsi/sata_sil24.c
@@ -1205,7 +1205,7 @@ static int sil24_pci_device_resume(struct pci_dev *pdev)
1205 1205
1206static int __init sil24_init(void) 1206static int __init sil24_init(void)
1207{ 1207{
1208 return pci_module_init(&sil24_pci_driver); 1208 return pci_register_driver(&sil24_pci_driver);
1209} 1209}
1210 1210
1211static void __exit sil24_exit(void) 1211static void __exit sil24_exit(void)
diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c
index ee6b5df41d30..ac24f66897f6 100644
--- a/drivers/scsi/sata_sis.c
+++ b/drivers/scsi/sata_sis.c
@@ -334,7 +334,7 @@ err_out:
334 334
335static int __init sis_init(void) 335static int __init sis_init(void)
336{ 336{
337 return pci_module_init(&sis_pci_driver); 337 return pci_register_driver(&sis_pci_driver);
338} 338}
339 339
340static void __exit sis_exit(void) 340static void __exit sis_exit(void)
diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c
index 7d0858095e1f..baf259a966d0 100644
--- a/drivers/scsi/sata_svw.c
+++ b/drivers/scsi/sata_svw.c
@@ -488,7 +488,7 @@ static struct pci_driver k2_sata_pci_driver = {
488 488
489static int __init k2_sata_init(void) 489static int __init k2_sata_init(void)
490{ 490{
491 return pci_module_init(&k2_sata_pci_driver); 491 return pci_register_driver(&k2_sata_pci_driver);
492} 492}
493 493
494 494
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
index ccc8cad24f7d..0da83cba5c12 100644
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
@@ -1482,7 +1482,7 @@ err_out:
1482 1482
1483static int __init pdc_sata_init(void) 1483static int __init pdc_sata_init(void)
1484{ 1484{
1485 return pci_module_init(&pdc_sata_pci_driver); 1485 return pci_register_driver(&pdc_sata_pci_driver);
1486} 1486}
1487 1487
1488 1488
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c
index 33cdb4867ef1..654aae2b25c5 100644
--- a/drivers/scsi/sata_uli.c
+++ b/drivers/scsi/sata_uli.c
@@ -287,7 +287,7 @@ err_out:
287 287
288static int __init uli_init(void) 288static int __init uli_init(void)
289{ 289{
290 return pci_module_init(&uli_pci_driver); 290 return pci_register_driver(&uli_pci_driver);
291} 291}
292 292
293static void __exit uli_exit(void) 293static void __exit uli_exit(void)
diff --git a/drivers/scsi/sata_via.c b/drivers/scsi/sata_via.c
index 03baec2191bf..0bf1dbea6406 100644
--- a/drivers/scsi/sata_via.c
+++ b/drivers/scsi/sata_via.c
@@ -381,7 +381,7 @@ err_out:
381 381
382static int __init svia_init(void) 382static int __init svia_init(void)
383{ 383{
384 return pci_module_init(&svia_pci_driver); 384 return pci_register_driver(&svia_pci_driver);
385} 385}
386 386
387static void __exit svia_exit(void) 387static void __exit svia_exit(void)
diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c
index ad37871594f5..4c69a705a483 100644
--- a/drivers/scsi/sata_vsc.c
+++ b/drivers/scsi/sata_vsc.c
@@ -462,7 +462,7 @@ static struct pci_driver vsc_sata_pci_driver = {
462 462
463static int __init vsc_sata_init(void) 463static int __init vsc_sata_init(void)
464{ 464{
465 return pci_module_init(&vsc_sata_pci_driver); 465 return pci_register_driver(&vsc_sata_pci_driver);
466} 466}
467 467
468 468