Commit 79ed35a9 authored by Jeff Garzik's avatar Jeff Garzik

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

parents 6a2e42ad b7887196
...@@ -1665,7 +1665,7 @@ static void ahci_remove_one (struct pci_dev *pdev) ...@@ -1665,7 +1665,7 @@ static void ahci_remove_one (struct pci_dev *pdev)
static int __init ahci_init(void) 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) static void __exit ahci_exit(void)
......
...@@ -939,8 +939,8 @@ static int __init piix_init(void) ...@@ -939,8 +939,8 @@ static int __init piix_init(void)
{ {
int rc; int rc;
DPRINTK("pci_module_init\n"); DPRINTK("pci_register_driver\n");
rc = pci_module_init(&piix_pci_driver); rc = pci_register_driver(&piix_pci_driver);
if (rc) if (rc)
return rc; return rc;
......
...@@ -722,7 +722,7 @@ static int adma_ata_init_one(struct pci_dev *pdev, ...@@ -722,7 +722,7 @@ static int adma_ata_init_one(struct pci_dev *pdev,
static int __init adma_ata_init(void) 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) static void __exit adma_ata_exit(void)
......
...@@ -2447,7 +2447,7 @@ static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -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) 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) static void __exit mv_exit(void)
......
...@@ -583,7 +583,7 @@ static void nv_ck804_host_stop(struct ata_host_set *host_set) ...@@ -583,7 +583,7 @@ static void nv_ck804_host_stop(struct ata_host_set *host_set)
static int __init nv_init(void) 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) static void __exit nv_exit(void)
......
...@@ -824,7 +824,7 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e ...@@ -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) static int __init pdc_ata_init(void)
{ {
return pci_module_init(&pdc_ata_pci_driver); return pci_register_driver(&pdc_ata_pci_driver);
} }
......
...@@ -712,7 +712,7 @@ static int qs_ata_init_one(struct pci_dev *pdev, ...@@ -712,7 +712,7 @@ static int qs_ata_init_one(struct pci_dev *pdev,
static int __init qs_ata_init(void) 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) static void __exit qs_ata_exit(void)
......
...@@ -710,7 +710,7 @@ static int sil_pci_device_resume(struct pci_dev *pdev) ...@@ -710,7 +710,7 @@ static int sil_pci_device_resume(struct pci_dev *pdev)
static int __init sil_init(void) 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) static void __exit sil_exit(void)
......
...@@ -1205,7 +1205,7 @@ static int sil24_pci_device_resume(struct pci_dev *pdev) ...@@ -1205,7 +1205,7 @@ static int sil24_pci_device_resume(struct pci_dev *pdev)
static int __init sil24_init(void) 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) static void __exit sil24_exit(void)
......
...@@ -334,7 +334,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -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) 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) static void __exit sis_exit(void)
......
...@@ -488,7 +488,7 @@ static struct pci_driver k2_sata_pci_driver = { ...@@ -488,7 +488,7 @@ static struct pci_driver k2_sata_pci_driver = {
static int __init k2_sata_init(void) static int __init k2_sata_init(void)
{ {
return pci_module_init(&k2_sata_pci_driver); return pci_register_driver(&k2_sata_pci_driver);
} }
......
...@@ -1482,7 +1482,7 @@ static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id * ...@@ -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) static int __init pdc_sata_init(void)
{ {
return pci_module_init(&pdc_sata_pci_driver); return pci_register_driver(&pdc_sata_pci_driver);
} }
......
...@@ -287,7 +287,7 @@ static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -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) 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) static void __exit uli_exit(void)
......
...@@ -381,7 +381,7 @@ static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -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) 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) static void __exit svia_exit(void)
......
...@@ -462,7 +462,7 @@ static struct pci_driver vsc_sata_pci_driver = { ...@@ -462,7 +462,7 @@ static struct pci_driver vsc_sata_pci_driver = {
static int __init vsc_sata_init(void) static int __init vsc_sata_init(void)
{ {
return pci_module_init(&vsc_sata_pci_driver); return pci_register_driver(&vsc_sata_pci_driver);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment