mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
of: Remove duplicate fields from of_platform_driver
.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver. This patch is a removes the extra copies from struct of_platform_driver and converts all users to the device_driver members. This patch is a pretty mechanical change. The usage model doesn't change and if any drivers have been missed, or if anything has been fixed up incorrectly, then it will fail with a compile time error, and the fixup will be trivial. This patch looks big and scary because it touches so many files, but it should be pretty safe. Signed-off-by: Grant Likely <[email protected]> Acked-by: Sean MacLennan <[email protected]>
This commit is contained in:
parent
597b9d1e44
commit
4018294b53
146 changed files with 671 additions and 387 deletions
|
|
@ -338,15 +338,13 @@ static struct of_device_id mpc85xx_pci_err_of_match[] = {
|
|||
};
|
||||
|
||||
static struct of_platform_driver mpc85xx_pci_err_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "mpc85xx_pci_err",
|
||||
.match_table = mpc85xx_pci_err_of_match,
|
||||
.probe = mpc85xx_pci_err_probe,
|
||||
.remove = __devexit_p(mpc85xx_pci_err_remove),
|
||||
.driver = {
|
||||
.name = "mpc85xx_pci_err",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
.name = "mpc85xx_pci_err",
|
||||
.owner = THIS_MODULE,
|
||||
.of_match_table = mpc85xx_pci_err_of_match,
|
||||
},
|
||||
};
|
||||
|
||||
#endif /* CONFIG_PCI */
|
||||
|
|
@ -654,15 +652,13 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = {
|
|||
};
|
||||
|
||||
static struct of_platform_driver mpc85xx_l2_err_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "mpc85xx_l2_err",
|
||||
.match_table = mpc85xx_l2_err_of_match,
|
||||
.probe = mpc85xx_l2_err_probe,
|
||||
.remove = mpc85xx_l2_err_remove,
|
||||
.driver = {
|
||||
.name = "mpc85xx_l2_err",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
.name = "mpc85xx_l2_err",
|
||||
.owner = THIS_MODULE,
|
||||
.of_match_table = mpc85xx_l2_err_of_match,
|
||||
},
|
||||
};
|
||||
|
||||
/**************************** MC Err device ***************************/
|
||||
|
|
@ -1131,15 +1127,13 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = {
|
|||
};
|
||||
|
||||
static struct of_platform_driver mpc85xx_mc_err_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "mpc85xx_mc_err",
|
||||
.match_table = mpc85xx_mc_err_of_match,
|
||||
.probe = mpc85xx_mc_err_probe,
|
||||
.remove = mpc85xx_mc_err_remove,
|
||||
.driver = {
|
||||
.name = "mpc85xx_mc_err",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
.name = "mpc85xx_mc_err",
|
||||
.owner = THIS_MODULE,
|
||||
.of_match_table = mpc85xx_mc_err_of_match,
|
||||
},
|
||||
};
|
||||
|
||||
#ifdef CONFIG_MPC85xx
|
||||
|
|
|
|||
|
|
@ -202,13 +202,13 @@ static struct of_device_id ppc4xx_edac_match[] = {
|
|||
};
|
||||
|
||||
static struct of_platform_driver ppc4xx_edac_driver = {
|
||||
.match_table = ppc4xx_edac_match,
|
||||
.probe = ppc4xx_edac_probe,
|
||||
.remove = ppc4xx_edac_remove,
|
||||
.driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = PPC4XX_EDAC_MODULE_NAME
|
||||
}
|
||||
.driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = PPC4XX_EDAC_MODULE_NAME
|
||||
.of_match_table = ppc4xx_edac_match,
|
||||
},
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in a new issue