Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9ab09e2 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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

drivers/ide/pci/aec62xx.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -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 = { 




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);

drivers/ide/pci/alim15x3.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -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 = { 




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);

drivers/ide/pci/amd74xx.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -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 = { 




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);

drivers/ide/pci/atiixp.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -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 = { 




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);

drivers/ide/pci/cmd64x.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -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 = { 




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);