redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ide: use unique names for struct pci_driver instances 

Noticed-by: Russell King <rmk+lkml@arm.linux.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
hifive-unleashed-5.1
Bartlomiej Zolnierkiewicz 2008-10-13 21:39:41 +02:00
parent d6ff9f64e6
commit a9ab09e260
33 changed files with 98 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/ide/pci/aec62xx.c
View File

@ -302,7 +302,7 @@ static const struct pci_device_id 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",
.id_table = aec62xx_pci_tbl,
.probe = aec62xx_init_one,
@ -313,12 +313,12 @@ static struct pci_driver driver = {
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)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&aec62xx_pci_driver);
}
module_init(aec62xx_ide_init);

6
drivers/ide/pci/alim15x3.c
View File

@ -575,7 +575,7 @@ static const struct pci_device_id 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",
.id_table = alim15x3_pci_tbl,
.probe = alim15x3_init_one,
@ -586,12 +586,12 @@ static struct pci_driver driver = {
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)
{
return pci_unregister_driver(&driver);
return pci_unregister_driver(&alim15x3_pci_driver);
}
module_init(ali15x3_ide_init);

6
drivers/ide/pci/amd74xx.c
View File

@ -319,7 +319,7 @@ static const struct pci_device_id 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",
.id_table = amd74xx_pci_tbl,
.probe = amd74xx_probe,
@ -330,12 +330,12 @@ static struct pci_driver driver = {
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)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&amd74xx_pci_driver);
}
module_init(amd74xx_ide_init);

6
drivers/ide/pci/atiixp.c
View File

@ -182,7 +182,7 @@ static const struct pci_device_id 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",
.id_table = atiixp_pci_tbl,
.probe = atiixp_init_one,
@ -193,12 +193,12 @@ static struct pci_driver driver = {
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)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&atiixp_pci_driver);
}
module_init(atiixp_ide_init);

6
drivers/ide/pci/cmd64x.c
View File

@ -505,7 +505,7 @@ static const struct pci_device_id 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",
.id_table = cmd64x_pci_tbl,
.probe = cmd64x_init_one,
@ -516,12 +516,12 @@ static struct pci_driver driver = {
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)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&cmd64x_pci_driver);
}
module_init(cmd64x_ide_init);

4
drivers/ide/pci/cs5520.c
View File

@ -145,7 +145,7 @@ static const struct pci_device_id 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",
.id_table = cs5520_pci_tbl,
.probe = cs5520_init_one,
@ -155,7 +155,7 @@ static struct pci_driver driver = {
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);

6
drivers/ide/pci/cs5530.c
View File

@ -267,7 +267,7 @@ static const struct pci_device_id 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",
.id_table = cs5530_pci_tbl,
.probe = cs5530_init_one,
@ -278,12 +278,12 @@ static struct pci_driver driver = {
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)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&cs5530_pci_driver);
}
module_init(cs5530_ide_init);

6
drivers/ide/pci/cs5535.c
View File

@ -192,7 +192,7 @@ static const struct pci_device_id 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",
.id_table = cs5535_pci_tbl,
.probe = cs5535_init_one,
@ -203,12 +203,12 @@ static struct pci_driver driver = {
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)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&cs5535_pci_driver);
}
module_init(cs5535_ide_init);

6
drivers/ide/pci/cy82c693.c
View File

@ -331,7 +331,7 @@ static const struct pci_device_id 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",
.id_table = cy82c693_pci_tbl,
.probe = cy82c693_init_one,
@ -342,12 +342,12 @@ static struct pci_driver driver = {
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)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&cy82c693_pci_driver);
}
module_init(cy82c693_ide_init);

6
drivers/ide/pci/delkin_cb.c
View File

@ -117,7 +117,7 @@ static struct pci_device_id delkin_cb_pci_tbl[] __devinitdata = {
};
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",
.id_table = delkin_cb_pci_tbl,
.probe = delkin_cb_probe,
@ -126,12 +126,12 @@ static struct pci_driver driver = {
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)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&delkin_cb_pci_driver);
}
module_init(delkin_cb_init);

6
drivers/ide/pci/generic.c
View File

@ -166,7 +166,7 @@ static const struct pci_device_id 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",
.id_table = generic_pci_tbl,
.probe = generic_init_one,
@ -177,12 +177,12 @@ static struct pci_driver driver = {
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)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&generic_pci_driver);
}
module_init(generic_ide_init);

6
drivers/ide/pci/hpt34x.c
View File

@ -166,7 +166,7 @@ static const struct pci_device_id 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",
.id_table = hpt34x_pci_tbl,
.probe = hpt34x_init_one,
@ -177,12 +177,12 @@ static struct pci_driver driver = {
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)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&hpt34x_pci_driver);
}
module_init(hpt34x_ide_init);

6
drivers/ide/pci/hpt366.c
View File

@ -1619,7 +1619,7 @@ static const struct pci_device_id hpt366_pci_tbl[] __devinitconst = {
};
MODULE_DEVICE_TABLE(pci, hpt366_pci_tbl);
static struct pci_driver driver = {
static struct pci_driver hpt366_pci_driver = {
.name = "HPT366_IDE",
.id_table = hpt366_pci_tbl,
.probe = hpt366_init_one,
@ -1630,12 +1630,12 @@ static struct pci_driver driver = {
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)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&hpt366_pci_driver);
}
module_init(hpt366_ide_init);

6
drivers/ide/pci/it8213.c
View File

@ -189,7 +189,7 @@ static const struct pci_device_id 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",
.id_table = it8213_pci_tbl,
.probe = it8213_init_one,
@ -200,12 +200,12 @@ static struct pci_driver driver = {
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)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&it8213_pci_driver);
}
module_init(it8213_ide_init);

6
drivers/ide/pci/it821x.c
View File

@ -676,7 +676,7 @@ static const struct pci_device_id 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",
.id_table = it821x_pci_tbl,
.probe = it821x_init_one,
@ -687,12 +687,12 @@ static struct pci_driver driver = {
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)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&it821x_pci_driver);
}
module_init(it821x_ide_init);

6
drivers/ide/pci/jmicron.c
View File

@ -149,7 +149,7 @@ static struct pci_device_id 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",
.id_table = jmicron_pci_tbl,
.probe = jmicron_init_one,
@ -160,12 +160,12 @@ static struct pci_driver driver = {
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)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&jmicron_pci_driver);
}
module_init(jmicron_ide_init);

6
drivers/ide/pci/ns87415.c
View File

@ -339,7 +339,7 @@ static const struct pci_device_id 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",
.id_table = ns87415_pci_tbl,
.probe = ns87415_init_one,
@ -350,12 +350,12 @@ static struct pci_driver driver = {
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)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&ns87415_pci_driver);
}
module_init(ns87415_ide_init);

6
drivers/ide/pci/opti621.c
View File

@ -220,7 +220,7 @@ static const struct pci_device_id 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",
.id_table = opti621_pci_tbl,
.probe = opti621_init_one,
@ -231,12 +231,12 @@ static struct pci_driver driver = {
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)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&opti621_pci_driver);
}
module_init(opti621_ide_init);

6
drivers/ide/pci/pdc202xx_new.c
View File

@ -561,7 +561,7 @@ static const struct pci_device_id 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",
.id_table = pdc202new_pci_tbl,
.probe = pdc202new_init_one,
@ -572,12 +572,12 @@ static struct pci_driver driver = {
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)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&pdc202new_pci_driver);
}
module_init(pdc202new_ide_init);

6
drivers/ide/pci/pdc202xx_old.c
View File

@ -426,7 +426,7 @@ static const struct pci_device_id 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",
.id_table = pdc202xx_pci_tbl,
.probe = pdc202xx_init_one,
@ -437,12 +437,12 @@ static struct pci_driver driver = {
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)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&pdc202xx_pci_driver);
}
module_init(pdc202xx_ide_init);

6
drivers/ide/pci/piix.c
View File

@ -444,7 +444,7 @@ static const struct pci_device_id 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",
.id_table = piix_pci_tbl,
.probe = piix_init_one,
@ -456,12 +456,12 @@ static struct pci_driver driver = {
static int __init piix_ide_init(void)
{
piix_check_450nx();
return ide_pci_register_driver(&driver);
return ide_pci_register_driver(&piix_pci_driver);
}
static void __exit piix_ide_exit(void)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&piix_pci_driver);
}
module_init(piix_ide_init);

6
drivers/ide/pci/rz1000.c
View File

@ -59,7 +59,7 @@ static const struct pci_device_id rz1000_pci_tbl[] = {
};
MODULE_DEVICE_TABLE(pci, rz1000_pci_tbl);
static struct pci_driver driver = {
static struct pci_driver rz1000_pci_driver = {
.name = "RZ1000_IDE",
.id_table = rz1000_pci_tbl,
.probe = rz1000_init_one,
@ -68,12 +68,12 @@ static struct pci_driver driver = {
static int __init rz1000_ide_init(void)
{
return ide_pci_register_driver(&driver);
return ide_pci_register_driver(&rz1000_pci_driver);
}
static void __exit rz1000_ide_exit(void)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&rz1000_pci_driver);
}
module_init(rz1000_ide_init);

6
drivers/ide/pci/sc1200.c
View File

@ -328,7 +328,7 @@ static const struct pci_device_id sc1200_pci_tbl[] = {
};
MODULE_DEVICE_TABLE(pci, sc1200_pci_tbl);
static struct pci_driver driver = {
static struct pci_driver sc1200_pci_driver = {
.name = "SC1200_IDE",
.id_table = sc1200_pci_tbl,
.probe = sc1200_init_one,
@ -341,12 +341,12 @@ static struct pci_driver driver = {
static int __init sc1200_ide_init(void)
{
return ide_pci_register_driver(&driver);
return ide_pci_register_driver(&sc1200_pci_driver);
}
static void __exit sc1200_ide_exit(void)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&sc1200_pci_driver);
}
module_init(sc1200_ide_init);

6
drivers/ide/pci/scc_pata.c
View File

@ -944,7 +944,7 @@ static const struct pci_device_id scc_pci_tbl[] = {
};
MODULE_DEVICE_TABLE(pci, scc_pci_tbl);
static struct pci_driver driver = {
static struct pci_driver scc_pci_driver = {
.name = "SCC IDE",
.id_table = scc_pci_tbl,
.probe = scc_init_one,
@ -953,14 +953,14 @@ static struct pci_driver driver = {
static int scc_ide_init(void)
{
return ide_pci_register_driver(&driver);
return ide_pci_register_driver(&scc_pci_driver);
}
module_init(scc_ide_init);
/* -- No exit code?
static void scc_ide_exit(void)
{
ide_pci_unregister_driver(&driver);
ide_pci_unregister_driver(&scc_pci_driver);
}
module_exit(scc_ide_exit);
*/

6
drivers/ide/pci/serverworks.c
View File

@ -443,7 +443,7 @@ static const struct pci_device_id svwks_pci_tbl[] = {
};
MODULE_DEVICE_TABLE(pci, svwks_pci_tbl);
static struct pci_driver driver = {
static struct pci_driver svwks_pci_driver = {
.name = "Serverworks_IDE",
.id_table = svwks_pci_tbl,
.probe = svwks_init_one,
@ -454,12 +454,12 @@ static struct pci_driver driver = {
static int __init svwks_ide_init(void)
{
return ide_pci_register_driver(&driver);
return ide_pci_register_driver(&svwks_pci_driver);
}
static void __exit svwks_ide_exit(void)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&svwks_pci_driver);
}
module_init(svwks_ide_init);

6
drivers/ide/pci/siimage.c
View File

@ -830,7 +830,7 @@ static const struct pci_device_id siimage_pci_tbl[] = {
};
MODULE_DEVICE_TABLE(pci, siimage_pci_tbl);
static struct pci_driver driver = {
static struct pci_driver siimage_pci_driver = {
.name = "SiI_IDE",
.id_table = siimage_pci_tbl,
.probe = siimage_init_one,
@ -841,12 +841,12 @@ static struct pci_driver driver = {
static int __init siimage_ide_init(void)
{
return ide_pci_register_driver(&driver);
return ide_pci_register_driver(&siimage_pci_driver);
}
static void __exit siimage_ide_exit(void)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&siimage_pci_driver);
}
module_init(siimage_ide_init);

6
drivers/ide/pci/sis5513.c
View File

@ -605,7 +605,7 @@ static const struct pci_device_id sis5513_pci_tbl[] = {
};
MODULE_DEVICE_TABLE(pci, sis5513_pci_tbl);
static struct pci_driver driver = {
static struct pci_driver sis5513_pci_driver = {
.name = "SIS_IDE",
.id_table = sis5513_pci_tbl,
.probe = sis5513_init_one,
@ -616,12 +616,12 @@ static struct pci_driver driver = {
static int __init sis5513_ide_init(void)
{
return ide_pci_register_driver(&driver);
return ide_pci_register_driver(&sis5513_pci_driver);
}
static void __exit sis5513_ide_exit(void)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&sis5513_pci_driver);
}
module_init(sis5513_ide_init);

6
drivers/ide/pci/sl82c105.c
View File

@ -345,7 +345,7 @@ static const struct pci_device_id sl82c105_pci_tbl[] = {
};
MODULE_DEVICE_TABLE(pci, sl82c105_pci_tbl);
static struct pci_driver driver = {
static struct pci_driver sl82c105_pci_driver = {
.name = "W82C105_IDE",
.id_table = sl82c105_pci_tbl,
.probe = sl82c105_init_one,
@ -356,12 +356,12 @@ static struct pci_driver driver = {
static int __init sl82c105_ide_init(void)
{
return ide_pci_register_driver(&driver);
return ide_pci_register_driver(&sl82c105_pci_driver);
}
static void __exit sl82c105_ide_exit(void)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&sl82c105_pci_driver);
}
module_init(sl82c105_ide_init);

6
drivers/ide/pci/slc90e66.c
View File

@ -154,7 +154,7 @@ static const struct pci_device_id slc90e66_pci_tbl[] = {
};
MODULE_DEVICE_TABLE(pci, slc90e66_pci_tbl);
static struct pci_driver driver = {
static struct pci_driver slc90e66_pci_driver = {
.name = "SLC90e66_IDE",
.id_table = slc90e66_pci_tbl,
.probe = slc90e66_init_one,
@ -165,12 +165,12 @@ static struct pci_driver driver = {
static int __init slc90e66_ide_init(void)
{
return ide_pci_register_driver(&driver);
return ide_pci_register_driver(&slc90e66_pci_driver);
}
static void __exit slc90e66_ide_exit(void)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&slc90e66_pci_driver);
}
module_init(slc90e66_ide_init);

6
drivers/ide/pci/tc86c001.c
View File

@ -245,7 +245,7 @@ static const struct pci_device_id tc86c001_pci_tbl[] = {
};
MODULE_DEVICE_TABLE(pci, tc86c001_pci_tbl);
static struct pci_driver driver = {
static struct pci_driver tc86c001_pci_driver = {
.name = "TC86C001",
.id_table = tc86c001_pci_tbl,
.probe = tc86c001_init_one,
@ -254,12 +254,12 @@ static struct pci_driver driver = {
static int __init tc86c001_ide_init(void)
{
return ide_pci_register_driver(&driver);
return ide_pci_register_driver(&tc86c001_pci_driver);
}
static void __exit tc86c001_ide_exit(void)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&tc86c001_pci_driver);
}
module_init(tc86c001_ide_init);

6
drivers/ide/pci/triflex.c
View File

@ -113,7 +113,7 @@ static const struct pci_device_id triflex_pci_tbl[] = {
};
MODULE_DEVICE_TABLE(pci, triflex_pci_tbl);
static struct pci_driver driver = {
static struct pci_driver triflex_pci_driver = {
.name = "TRIFLEX_IDE",
.id_table = triflex_pci_tbl,
.probe = triflex_init_one,
@ -124,12 +124,12 @@ static struct pci_driver driver = {
static int __init triflex_ide_init(void)
{
return ide_pci_register_driver(&driver);
return ide_pci_register_driver(&triflex_pci_driver);
}
static void __exit triflex_ide_exit(void)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&triflex_pci_driver);
}
module_init(triflex_ide_init);

6
drivers/ide/pci/trm290.c
View File

@ -350,7 +350,7 @@ static const struct pci_device_id trm290_pci_tbl[] = {
};
MODULE_DEVICE_TABLE(pci, trm290_pci_tbl);
static struct pci_driver driver = {
static struct pci_driver trm290_pci_driver = {
.name = "TRM290_IDE",
.id_table = trm290_pci_tbl,
.probe = trm290_init_one,
@ -359,12 +359,12 @@ static struct pci_driver driver = {
static int __init trm290_ide_init(void)
{
return ide_pci_register_driver(&driver);
return ide_pci_register_driver(&trm290_pci_driver);
}
static void __exit trm290_ide_exit(void)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&trm290_pci_driver);
}
module_init(trm290_ide_init);

6
drivers/ide/pci/via82cxxx.c
View File

@ -487,7 +487,7 @@ static const struct pci_device_id via_pci_tbl[] = {
};
MODULE_DEVICE_TABLE(pci, via_pci_tbl);
static struct pci_driver driver = {
static struct pci_driver via_pci_driver = {
.name = "VIA_IDE",
.id_table = via_pci_tbl,
.probe = via_init_one,
@ -498,12 +498,12 @@ static struct pci_driver driver = {
static int __init via_ide_init(void)
{
return ide_pci_register_driver(&driver);
return ide_pci_register_driver(&via_pci_driver);
}
static void __exit via_ide_exit(void)
{
pci_unregister_driver(&driver);
pci_unregister_driver(&via_pci_driver);
}
module_init(via_ide_init);