ide: use unique names for struct pci_driver instances

Noticed-by: default avatarRussell King <rmk+lkml@arm.linux.org.uk>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent d6ff9f64
...@@ -302,7 +302,7 @@ static const struct pci_device_id aec62xx_pci_tbl[] = { ...@@ -302,7 +302,7 @@ static const struct pci_device_id aec62xx_pci_tbl[] = {
}; };
MODULE_DEVICE_TABLE(pci, aec62xx_pci_tbl); MODULE_DEVICE_TABLE(pci, aec62xx_pci_tbl);
static struct pci_driver driver = { static struct pci_driver aec62xx_pci_driver = {
.name = "AEC62xx_IDE", .name = "AEC62xx_IDE",
.id_table = aec62xx_pci_tbl, .id_table = aec62xx_pci_tbl,
.probe = aec62xx_init_one, .probe = aec62xx_init_one,
...@@ -313,12 +313,12 @@ static struct pci_driver driver = { ...@@ -313,12 +313,12 @@ static struct pci_driver driver = {
static int __init aec62xx_ide_init(void) static int __init aec62xx_ide_init(void)
{ {
return ide_pci_register_driver(&driver); return ide_pci_register_driver(&aec62xx_pci_driver);
} }
static void __exit aec62xx_ide_exit(void) static void __exit aec62xx_ide_exit(void)
{ {
pci_unregister_driver(&driver); pci_unregister_driver(&aec62xx_pci_driver);
} }
module_init(aec62xx_ide_init); module_init(aec62xx_ide_init);
......
...@@ -575,7 +575,7 @@ static const struct pci_device_id alim15x3_pci_tbl[] = { ...@@ -575,7 +575,7 @@ static const struct pci_device_id alim15x3_pci_tbl[] = {
}; };
MODULE_DEVICE_TABLE(pci, alim15x3_pci_tbl); MODULE_DEVICE_TABLE(pci, alim15x3_pci_tbl);
static struct pci_driver driver = { static struct pci_driver alim15x3_pci_driver = {
.name = "ALI15x3_IDE", .name = "ALI15x3_IDE",
.id_table = alim15x3_pci_tbl, .id_table = alim15x3_pci_tbl,
.probe = alim15x3_init_one, .probe = alim15x3_init_one,
...@@ -586,12 +586,12 @@ static struct pci_driver driver = { ...@@ -586,12 +586,12 @@ static struct pci_driver driver = {
static int __init ali15x3_ide_init(void) static int __init ali15x3_ide_init(void)
{ {
return ide_pci_register_driver(&driver); return ide_pci_register_driver(&alim15x3_pci_driver);
} }
static void __exit ali15x3_ide_exit(void) static void __exit ali15x3_ide_exit(void)
{ {
return pci_unregister_driver(&driver); return pci_unregister_driver(&alim15x3_pci_driver);
} }
module_init(ali15x3_ide_init); module_init(ali15x3_ide_init);
......
...@@ -319,7 +319,7 @@ static const struct pci_device_id amd74xx_pci_tbl[] = { ...@@ -319,7 +319,7 @@ static const struct pci_device_id amd74xx_pci_tbl[] = {
}; };
MODULE_DEVICE_TABLE(pci, amd74xx_pci_tbl); MODULE_DEVICE_TABLE(pci, amd74xx_pci_tbl);
static struct pci_driver driver = { static struct pci_driver amd74xx_pci_driver = {
.name = "AMD_IDE", .name = "AMD_IDE",
.id_table = amd74xx_pci_tbl, .id_table = amd74xx_pci_tbl,
.probe = amd74xx_probe, .probe = amd74xx_probe,
...@@ -330,12 +330,12 @@ static struct pci_driver driver = { ...@@ -330,12 +330,12 @@ static struct pci_driver driver = {
static int __init amd74xx_ide_init(void) static int __init amd74xx_ide_init(void)
{ {
return ide_pci_register_driver(&driver); return ide_pci_register_driver(&amd74xx_pci_driver);
} }
static void __exit amd74xx_ide_exit(void) static void __exit amd74xx_ide_exit(void)
{ {
pci_unregister_driver(&driver); pci_unregister_driver(&amd74xx_pci_driver);
} }
module_init(amd74xx_ide_init); module_init(amd74xx_ide_init);
......
...@@ -182,7 +182,7 @@ static const struct pci_device_id atiixp_pci_tbl[] = { ...@@ -182,7 +182,7 @@ static const struct pci_device_id atiixp_pci_tbl[] = {
}; };
MODULE_DEVICE_TABLE(pci, atiixp_pci_tbl); MODULE_DEVICE_TABLE(pci, atiixp_pci_tbl);
static struct pci_driver driver = { static struct pci_driver atiixp_pci_driver = {
.name = "ATIIXP_IDE", .name = "ATIIXP_IDE",
.id_table = atiixp_pci_tbl, .id_table = atiixp_pci_tbl,
.probe = atiixp_init_one, .probe = atiixp_init_one,
...@@ -193,12 +193,12 @@ static struct pci_driver driver = { ...@@ -193,12 +193,12 @@ static struct pci_driver driver = {
static int __init atiixp_ide_init(void) static int __init atiixp_ide_init(void)
{ {
return ide_pci_register_driver(&driver); return ide_pci_register_driver(&atiixp_pci_driver);
} }
static void __exit atiixp_ide_exit(void) static void __exit atiixp_ide_exit(void)
{ {
pci_unregister_driver(&driver); pci_unregister_driver(&atiixp_pci_driver);
} }
module_init(atiixp_ide_init); module_init(atiixp_ide_init);
......
...@@ -505,7 +505,7 @@ static const struct pci_device_id cmd64x_pci_tbl[] = { ...@@ -505,7 +505,7 @@ static const struct pci_device_id cmd64x_pci_tbl[] = {
}; };
MODULE_DEVICE_TABLE(pci, cmd64x_pci_tbl); MODULE_DEVICE_TABLE(pci, cmd64x_pci_tbl);
static struct pci_driver driver = { static struct pci_driver cmd64x_pci_driver = {
.name = "CMD64x_IDE", .name = "CMD64x_IDE",
.id_table = cmd64x_pci_tbl, .id_table = cmd64x_pci_tbl,
.probe = cmd64x_init_one, .probe = cmd64x_init_one,
...@@ -516,12 +516,12 @@ static struct pci_driver driver = { ...@@ -516,12 +516,12 @@ static struct pci_driver driver = {
static int __init cmd64x_ide_init(void) static int __init cmd64x_ide_init(void)
{ {
return ide_pci_register_driver(&driver); return ide_pci_register_driver(&cmd64x_pci_driver);
} }
static void __exit cmd64x_ide_exit(void) static void __exit cmd64x_ide_exit(void)
{ {
pci_unregister_driver(&driver); pci_unregister_driver(&cmd64x_pci_driver);
} }
module_init(cmd64x_ide_init); module_init(cmd64x_ide_init);
......
...@@ -145,7 +145,7 @@ static const struct pci_device_id cs5520_pci_tbl[] = { ...@@ -145,7 +145,7 @@ static const struct pci_device_id cs5520_pci_tbl[] = {
}; };
MODULE_DEVICE_TABLE(pci, cs5520_pci_tbl); MODULE_DEVICE_TABLE(pci, cs5520_pci_tbl);
static struct pci_driver driver = { static struct pci_driver cs5520_pci_driver = {
.name = "Cyrix_IDE", .name = "Cyrix_IDE",
.id_table = cs5520_pci_tbl, .id_table = cs5520_pci_tbl,
.probe = cs5520_init_one, .probe = cs5520_init_one,
...@@ -155,7 +155,7 @@ static struct pci_driver driver = { ...@@ -155,7 +155,7 @@ static struct pci_driver driver = {
static int __init cs5520_ide_init(void) static int __init cs5520_ide_init(void)
{ {
return ide_pci_register_driver(&driver); return ide_pci_register_driver(&cs5520_pci_driver);
} }
module_init(cs5520_ide_init); module_init(cs5520_ide_init);
......
...@@ -267,7 +267,7 @@ static const struct pci_device_id cs5530_pci_tbl[] = { ...@@ -267,7 +267,7 @@ static const struct pci_device_id cs5530_pci_tbl[] = {
}; };
MODULE_DEVICE_TABLE(pci, cs5530_pci_tbl); MODULE_DEVICE_TABLE(pci, cs5530_pci_tbl);
static struct pci_driver driver = { static struct pci_driver cs5530_pci_driver = {
.name = "CS5530 IDE", .name = "CS5530 IDE",
.id_table = cs5530_pci_tbl, .id_table = cs5530_pci_tbl,
.probe = cs5530_init_one, .probe = cs5530_init_one,
...@@ -278,12 +278,12 @@ static struct pci_driver driver = { ...@@ -278,12 +278,12 @@ static struct pci_driver driver = {
static int __init cs5530_ide_init(void) static int __init cs5530_ide_init(void)
{ {
return ide_pci_register_driver(&driver); return ide_pci_register_driver(&cs5530_pci_driver);
} }
static void __exit cs5530_ide_exit(void) static void __exit cs5530_ide_exit(void)
{ {
pci_unregister_driver(&driver); pci_unregister_driver(&cs5530_pci_driver);
} }
module_init(cs5530_ide_init); module_init(cs5530_ide_init);
......
...@@ -192,7 +192,7 @@ static const struct pci_device_id cs5535_pci_tbl[] = { ...@@ -192,7 +192,7 @@ static const struct pci_device_id cs5535_pci_tbl[] = {
MODULE_DEVICE_TABLE(pci, cs5535_pci_tbl); MODULE_DEVICE_TABLE(pci, cs5535_pci_tbl);
static struct pci_driver driver = { static struct pci_driver cs5535_pci_driver = {
.name = "CS5535_IDE", .name = "CS5535_IDE",
.id_table = cs5535_pci_tbl, .id_table = cs5535_pci_tbl,
.probe = cs5535_init_one, .probe = cs5535_init_one,
...@@ -203,12 +203,12 @@ static struct pci_driver driver = { ...@@ -203,12 +203,12 @@ static struct pci_driver driver = {
static int __init cs5535_ide_init(void) static int __init cs5535_ide_init(void)
{ {
return ide_pci_register_driver(&driver); return ide_pci_register_driver(&cs5535_pci_driver);
} }
static void __exit cs5535_ide_exit(void) static void __exit cs5535_ide_exit(void)
{ {
pci_unregister_driver(&driver); pci_unregister_driver(&cs5535_pci_driver);
} }
module_init(cs5535_ide_init); module_init(cs5535_ide_init);
......
...@@ -331,7 +331,7 @@ static const struct pci_device_id cy82c693_pci_tbl[] = { ...@@ -331,7 +331,7 @@ static const struct pci_device_id cy82c693_pci_tbl[] = {
}; };
MODULE_DEVICE_TABLE(pci, cy82c693_pci_tbl); MODULE_DEVICE_TABLE(pci, cy82c693_pci_tbl);
static struct pci_driver driver = { static struct pci_driver cy82c693_pci_driver = {
.name = "Cypress_IDE", .name = "Cypress_IDE",
.id_table = cy82c693_pci_tbl, .id_table = cy82c693_pci_tbl,
.probe = cy82c693_init_one, .probe = cy82c693_init_one,
...@@ -342,12 +342,12 @@ static struct pci_driver driver = { ...@@ -342,12 +342,12 @@ static struct pci_driver driver = {
static int __init cy82c693_ide_init(void) static int __init cy82c693_ide_init(void)
{ {
return ide_pci_register_driver(&driver); return ide_pci_register_driver(&cy82c693_pci_driver);
} }
static void __exit cy82c693_ide_exit(void) static void __exit cy82c693_ide_exit(void)
{ {
pci_unregister_driver(&driver); pci_unregister_driver(&cy82c693_pci_driver);
} }
module_init(cy82c693_ide_init); module_init(cy82c693_ide_init);
......
...@@ -117,7 +117,7 @@ static struct pci_device_id delkin_cb_pci_tbl[] __devinitdata = { ...@@ -117,7 +117,7 @@ static struct pci_device_id delkin_cb_pci_tbl[] __devinitdata = {
}; };
MODULE_DEVICE_TABLE(pci, delkin_cb_pci_tbl); MODULE_DEVICE_TABLE(pci, delkin_cb_pci_tbl);
static struct pci_driver driver = { static struct pci_driver delkin_cb_pci_driver = {
.name = "Delkin-ASKA-Workbit Cardbus IDE", .name = "Delkin-ASKA-Workbit Cardbus IDE",
.id_table = delkin_cb_pci_tbl, .id_table = delkin_cb_pci_tbl,
.probe = delkin_cb_probe, .probe = delkin_cb_probe,
...@@ -126,12 +126,12 @@ static struct pci_driver driver = { ...@@ -126,12 +126,12 @@ static struct pci_driver driver = {
static int __init delkin_cb_init(void) static int __init delkin_cb_init(void)
{ {
return pci_register_driver(&driver); return pci_register_driver(&delkin_cb_pci_driver);
} }
static void __exit delkin_cb_exit(void) static void __exit delkin_cb_exit(void)
{ {
pci_unregister_driver(&driver); pci_unregister_driver(&delkin_cb_pci_driver);
} }
module_init(delkin_cb_init); module_init(delkin_cb_init);
......
...@@ -166,7 +166,7 @@ static const struct pci_device_id generic_pci_tbl[] = { ...@@ -166,7 +166,7 @@ static const struct pci_device_id generic_pci_tbl[] = {
}; };
MODULE_DEVICE_TABLE(pci, generic_pci_tbl); MODULE_DEVICE_TABLE(pci, generic_pci_tbl);
static struct pci_driver driver = { static struct pci_driver generic_pci_driver = {
.name = "PCI_IDE", .name = "PCI_IDE",
.id_table = generic_pci_tbl, .id_table = generic_pci_tbl,
.probe = generic_init_one, .probe = generic_init_one,
...@@ -177,12 +177,12 @@ static struct pci_driver driver = { ...@@ -177,12 +177,12 @@ static struct pci_driver driver = {
static int __init generic_ide_init(void) static int __init generic_ide_init(void)
{ {
return ide_pci_register_driver(&driver); return ide_pci_register_driver(&generic_pci_driver);
} }
static void __exit generic_ide_exit(void) static void __exit generic_ide_exit(void)
{ {
pci_unregister_driver(&driver); pci_unregister_driver(&generic_pci_driver);
} }
module_init(generic_ide_init); module_init(generic_ide_init);
......
...@@ -166,7 +166,7 @@ static const struct pci_device_id hpt34x_pci_tbl[] = { ...@@ -166,7 +166,7 @@ static const struct pci_device_id hpt34x_pci_tbl[] = {
}; };
MODULE_DEVICE_TABLE(pci, hpt34x_pci_tbl); MODULE_DEVICE_TABLE(pci, hpt34x_pci_tbl);
static struct pci_driver driver = { static struct pci_driver hpt34x_pci_driver = {
.name = "HPT34x_IDE", .name = "HPT34x_IDE",
.id_table = hpt34x_pci_tbl, .id_table = hpt34x_pci_tbl,
.probe = hpt34x_init_one, .probe = hpt34x_init_one,
...@@ -177,12 +177,12 @@ static struct pci_driver driver = { ...@@ -177,12 +177,12 @@ static struct pci_driver driver = {
static int __init hpt34x_ide_init(void) static int __init hpt34x_ide_init(void)
{ {
return ide_pci_register_driver(&driver); return ide_pci_register_driver(&hpt34x_pci_driver);
} }
static void __exit hpt34x_ide_exit(void) static void __exit hpt34x_ide_exit(void)
{ {
pci_unregister_driver(&driver); pci_unregister_driver(&hpt34x_pci_driver);
} }
module_init(hpt34x_ide_init); module_init(hpt34x_ide_init);
......
...@@ -1619,7 +1619,7 @@ static const struct pci_device_id hpt366_pci_tbl[] __devinitconst = { ...@@ -1619,7 +1619,7 @@ static const struct pci_device_id hpt366_pci_tbl[] __devinitconst = {
}; };
MODULE_DEVICE_TABLE(pci, hpt366_pci_tbl); MODULE_DEVICE_TABLE(pci, hpt366_pci_tbl);
static struct pci_driver driver = { static struct pci_driver hpt366_pci_driver = {
.name = "HPT366_IDE", .name = "HPT366_IDE",
.id_table = hpt366_pci_tbl, .id_table = hpt366_pci_tbl,
.probe = hpt366_init_one, .probe = hpt366_init_one,
...@@ -1630,12 +1630,12 @@ static struct pci_driver driver = { ...@@ -1630,12 +1630,12 @@ static struct pci_driver driver = {
static int __init hpt366_ide_init(void) static int __init hpt366_ide_init(void)
{ {
return ide_pci_register_driver(&driver); return ide_pci_register_driver(&hpt366_pci_driver);
} }
static void __exit hpt366_ide_exit(void) static void __exit hpt366_ide_exit(void)
{ {
pci_unregister_driver(&driver); pci_unregister_driver(&hpt366_pci_driver);
} }
module_init(hpt366_ide_init); module_init(hpt366_ide_init);
......
...@@ -189,7 +189,7 @@ static const struct pci_device_id it8213_pci_tbl[] = { ...@@ -189,7 +189,7 @@ static const struct pci_device_id it8213_pci_tbl[] = {
MODULE_DEVICE_TABLE(pci, it8213_pci_tbl); MODULE_DEVICE_TABLE(pci, it8213_pci_tbl);
static struct pci_driver driver = { static struct pci_driver it8213_pci_driver = {
.name = "ITE8213_IDE", .name = "ITE8213_IDE",
.id_table = it8213_pci_tbl, .id_table = it8213_pci_tbl,
.probe = it8213_init_one, .probe = it8213_init_one,
...@@ -200,12 +200,12 @@ static struct pci_driver driver = { ...@@ -200,12 +200,12 @@ static struct pci_driver driver = {
static int __init it8213_ide_init(void) static int __init it8213_ide_init(void)
{ {
return ide_pci_register_driver(&driver); return ide_pci_register_driver(&it8213_pci_driver);
} }
static void __exit it8213_ide_exit(void) static void __exit it8213_ide_exit(void)
{ {
pci_unregister_driver(&driver); pci_unregister_driver(&it8213_pci_driver);
} }
module_init(it8213_ide_init); module_init(it8213_ide_init);
......
...@@ -676,7 +676,7 @@ static const struct pci_device_id it821x_pci_tbl[] = { ...@@ -676,7 +676,7 @@ static const struct pci_device_id it821x_pci_tbl[] = {
MODULE_DEVICE_TABLE(pci, it821x_pci_tbl); MODULE_DEVICE_TABLE(pci, it821x_pci_tbl);
static struct pci_driver driver = { static struct pci_driver it821x_pci_driver = {
.name = "ITE821x IDE", .name = "ITE821x IDE",
.id_table = it821x_pci_tbl, .id_table = it821x_pci_tbl,
.probe = it821x_init_one, .probe = it821x_init_one,
...@@ -687,12 +687,12 @@ static struct pci_driver driver = { ...@@ -687,12 +687,12 @@ static struct pci_driver driver = {
static int __init it821x_ide_init(void) static int __init it821x_ide_init(void)
{ {
return ide_pci_register_driver(&driver); return ide_pci_register_driver(&it821x_pci_driver);
} }
static void __exit it821x_ide_exit(void) static void __exit it821x_ide_exit(void)
{ {
pci_unregister_driver(&driver); pci_unregister_driver(&it821x_pci_driver);
} }
module_init(it821x_ide_init); module_init(it821x_ide_init);
......
...@@ -149,7 +149,7 @@ static struct pci_device_id jmicron_pci_tbl[] = { ...@@ -149,7 +149,7 @@ static struct pci_device_id jmicron_pci_tbl[] = {
MODULE_DEVICE_TABLE(pci, jmicron_pci_tbl); MODULE_DEVICE_TABLE(pci, jmicron_pci_tbl);
static struct pci_driver driver = { static struct pci_driver jmicron_pci_driver = {
.name = "JMicron IDE", .name = "JMicron IDE",
.id_table = jmicron_pci_tbl, .id_table = jmicron_pci_tbl,
.probe = jmicron_init_one, .probe = jmicron_init_one,
...@@ -160,12 +160,12 @@ static struct pci_driver driver = { ...@@ -160,12 +160,12 @@ static struct pci_driver driver = {
static int __init jmicron_ide_init(void) static int __init jmicron_ide_init(void)
{ {
return ide_pci_register_driver(&driver); return ide_pci_register_driver(&jmicron_pci_driver);
} }
static void __exit jmicron_ide_exit(void) static void __exit jmicron_ide_exit(void)
{ {
pci_unregister_driver(&driver); pci_unregister_driver(&jmicron_pci_driver);
} }
module_init(jmicron_ide_init); module_init(jmicron_ide_init);
......
...@@ -339,7 +339,7 @@ static const struct pci_device_id ns87415_pci_tbl[] = { ...@@ -339,7 +339,7 @@ static const struct pci_device_id ns87415_pci_tbl[] = {
}; };
MODULE_DEVICE_TABLE(pci, ns87415_pci_tbl); MODULE_DEVICE_TABLE(pci, ns87415_pci_tbl);
static struct pci_driver driver = { static struct pci_driver ns87415_pci_driver = {
.name = "NS87415_IDE", .name = "NS87415_IDE",
.id_table = ns87415_pci_tbl, .id_table = ns87415_pci_tbl,
.probe = ns87415_init_one, .probe = ns87415_init_one,
...@@ -350,12 +350,12 @@ static struct pci_driver driver = { ...@@ -350,12 +350,12 @@ static struct pci_driver driver = {
static int __init ns87415_ide_init(void) static int __init ns87415_ide_init(void)
{ {
return ide_pci_register_driver(&driver); return ide_pci_register_driver(&ns87415_pci_driver);
} }
static void __exit ns87415_ide_exit(void) static void __exit ns87415_ide_exit(void)
{ {
pci_unregister_driver(&driver); pci_unregister_driver(&ns87415_pci_driver);
} }
module_init(ns87415_ide_init); module_init(ns87415_ide_init);
......
...@@ -220,7 +220,7 @@ static const struct pci_device_id opti621_pci_tbl[] = { ...@@ -220,7 +220,7 @@ static const struct pci_device_id opti621_pci_tbl[] = {
}; };
MODULE_DEVICE_TABLE(pci, opti621_pci_tbl); MODULE_DEVICE_TABLE(pci, opti621_pci_tbl);
static struct pci_driver driver = { static struct pci_driver opti621_pci_driver = {
.name = "Opti621_IDE", .name = "Opti621_IDE",
.id_table = opti621_pci_tbl, .id_table = opti621_pci_tbl,
.probe = opti621_init_one, .probe = opti621_init_one,
...@@ -231,12 +231,12 @@ static struct pci_driver driver = { ...@@ -231,12 +231,12 @@ static struct pci_driver driver = {
static int __init opti621_ide_init(void) static int __init opti621_ide_init(void)
{ {
return ide_pci_register_driver(&driver); return ide_pci_register_driver(&opti621_pci_driver);
} }
static void __exit opti621_ide_exit(void) static void __exit opti621_ide_exit(void)
{ {
pci_unregister_driver(&driver); pci_unregister_driver(&opti621_pci_driver);
} }
module_init(opti621_ide_init); module_init(opti621_ide_init);
......
...@@ -561,7 +561,7 @@ static const struct pci_device_id pdc202new_pci_tbl[] = { ...@@ -561,7 +561,7 @@ static const struct pci_device_id pdc202new_pci_tbl[] = {
}; };
MODULE_DEVICE_TABLE(pci, pdc202new_pci_tbl); MODULE_DEVICE_TABLE(pci, pdc202new_pci_tbl);
static struct pci_driver driver = { static struct pci_driver pdc202new_pci_driver = {
.name = "Promise_IDE", .name = "Promise_IDE",
.id_table = pdc202new_pci_tbl, .id_table = pdc202new_pci_tbl,
.probe = pdc202new_init_one, .probe = pdc202new_init_one,
...@@ -572,12 +572,12 @@ static struct pci_driver driver = { ...@@ -572,12 +572,12 @@ static struct pci_driver driver = {
static int __init pdc202new_ide_init(void) static int __init pdc202new_ide_init(void)
{ {
return ide_pci_register_driver(&driver); return ide_pci_register_driver(&pdc202new_pci_driver);
} }
static void __exit pdc202new_ide_exit(void) static void __exit pdc202new_ide_exit(void)
{ {
pci_unregister_driver(&driver); pci_unregister_driver(&pdc202new_pci_driver);
} }
module_init(pdc202new_ide_init); module_init(pdc202new_ide_init);
......
...@@ -426,7 +426,7 @@ static const struct pci_device_id pdc202xx_pci_tbl[] = { ...@@ -426,7 +426,7 @@ static const struct pci_device_id pdc202xx_pci_tbl[] = {
}; };
MODULE_DEVICE_TABLE(pci, pdc202xx_pci_tbl); MODULE_DEVICE_TABLE(pci, pdc202xx_pci_tbl);
static struct pci_driver driver = { static struct pci_driver pdc202xx_pci_driver = {
.name = "Promise_Old_IDE", .name = "Promise_Old_IDE",
.id_table = pdc202xx_pci_tbl, .id_table = pdc202xx_pci_tbl,
.probe = pdc202xx_init_one, .probe = pdc202xx_init_one,
...@@ -437,12 +437,12 @@ static struct pci_driver driver = { ...@@ -437,12 +437,12 @@ static struct pci_driver driver = {
static int __init pdc202xx_ide_init(void) static int __init pdc202xx_ide_init(void)
{ {
return ide_pci_register_driver(&driver); return ide_pci_register_driver(&pdc202xx_pci_driver);
} }
static void __exit pdc202xx_ide_exit(void) static void __exit pdc202xx_ide_exit(void)
{ {
pci_unregister_driver(&driver); pci_unregister_driver(&pdc202xx_pci_driver);
} }
module_init(pdc202xx_ide_init); module_init(pdc202xx_ide_init);
......
...@@ -444,7 +444,7 @@ static const struct pci_device_id piix_pci_tbl[] = { ...@@ -444,7 +444,7 @@ static const struct pci_device_id piix_pci_tbl[] = {
}; };
MODULE_DEVICE_TABLE(pci, piix_pci_tbl); MODULE_DEVICE_TABLE(pci, piix_pci_tbl);
static struct pci_driver driver = { static struct pci_driver piix_pci_driver = {
.name = "PIIX_IDE", .name = "PIIX_IDE",
.id_table = piix_pci_tbl, .id_table = piix_pci_tbl,
.probe = piix_init_one, .probe = piix_init_one,
...@@ -456,12 +456,12 @@ static struct pci_driver driver = { ...@@ -456,12 +456,12 @@ static struct pci_driver driver = {
static int __init piix_ide_init(void) static int __init piix_ide_init(void)
{ {
piix_check_450nx(); piix_check_450nx();
return ide_pci_register_driver(&driver); return ide_pci_register_driver(&piix_pci_driver);