Merge branch 'tj-upstream-pci_register_driver' of git://htj.dyndns.org/libata-tj into upstream

drivers/scsi/ahci.c

@@ -1665,7 +1665,7 @@ static void ahci_remove_one (struct pci_dev *pdev)
 
 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

@@ -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

@@ -722,7 +722,7 @@ static int adma_ata_init_one(struct pci_dev *pdev,
 
 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

@@ -2447,7 +2447,7 @@ static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 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

@@ -583,7 +583,7 @@ static void nv_ck804_host_stop(struct ata_host_set *host_set)
 
 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)

drivers/scsi/sata_promise.c

@@ -824,7 +824,7 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
 
 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

@@ -712,7 +712,7 @@ static int qs_ata_init_one(struct pci_dev *pdev,
 
 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

@@ -710,7 +710,7 @@ static int sil_pci_device_resume(struct pci_dev *pdev)
 
 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)

drivers/scsi/sata_sil24.c

@@ -1205,7 +1205,7 @@ static int sil24_pci_device_resume(struct pci_dev *pdev)
 
 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)

drivers/scsi/sata_sis.c

@@ -334,7 +334,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 
 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

@@ -488,7 +488,7 @@ static struct pci_driver k2_sata_pci_driver = {
 
 static 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

@@ -1482,7 +1482,7 @@ static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *
 
 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

@@ -287,7 +287,7 @@ static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 
 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

@@ -381,7 +381,7 @@ static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 
 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

@@ -462,7 +462,7 @@ static struct pci_driver vsc_sata_pci_driver = {
 
 static int __init vsc_sata_init(void)
 {
-	return pci_module_init(&vsc_sata_pci_driver);
+	return pci_register_driver(&vsc_sata_pci_driver);
 }