mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -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
|
|
@ -514,14 +514,12 @@ static const struct of_device_id mpc52xx_psc_spi_of_match[] = {
|
|||
MODULE_DEVICE_TABLE(of, mpc52xx_psc_spi_of_match);
|
||||
|
||||
static struct of_platform_driver mpc52xx_psc_spi_of_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "mpc52xx-psc-spi",
|
||||
.match_table = mpc52xx_psc_spi_of_match,
|
||||
.probe = mpc52xx_psc_spi_of_probe,
|
||||
.remove = __exit_p(mpc52xx_psc_spi_of_remove),
|
||||
.driver = {
|
||||
.name = "mpc52xx-psc-spi",
|
||||
.owner = THIS_MODULE,
|
||||
.of_match_table = mpc52xx_psc_spi_of_match,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -558,9 +558,11 @@ static const struct of_device_id mpc52xx_spi_match[] __devinitconst = {
|
|||
MODULE_DEVICE_TABLE(of, mpc52xx_spi_match);
|
||||
|
||||
static struct of_platform_driver mpc52xx_spi_of_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "mpc52xx-spi",
|
||||
.match_table = mpc52xx_spi_match,
|
||||
.driver = {
|
||||
.name = "mpc52xx-spi",
|
||||
.owner = THIS_MODULE,
|
||||
.of_match_table = mpc52xx_spi_match,
|
||||
},
|
||||
.probe = mpc52xx_spi_probe,
|
||||
.remove = __exit_p(mpc52xx_spi_remove),
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1312,8 +1312,11 @@ static const struct of_device_id of_mpc8xxx_spi_match[] = {
|
|||
MODULE_DEVICE_TABLE(of, of_mpc8xxx_spi_match);
|
||||
|
||||
static struct of_platform_driver of_mpc8xxx_spi_driver = {
|
||||
.name = "mpc8xxx_spi",
|
||||
.match_table = of_mpc8xxx_spi_match,
|
||||
.driver = {
|
||||
.name = "mpc8xxx_spi",
|
||||
.owner = THIS_MODULE,
|
||||
.of_match_table = of_mpc8xxx_spi_match,
|
||||
},
|
||||
.probe = of_mpc8xxx_spi_probe,
|
||||
.remove = __devexit_p(of_mpc8xxx_spi_remove),
|
||||
};
|
||||
|
|
|
|||
|
|
@ -587,12 +587,12 @@ static const struct of_device_id spi_ppc4xx_of_match[] = {
|
|||
MODULE_DEVICE_TABLE(of, spi_ppc4xx_of_match);
|
||||
|
||||
static struct of_platform_driver spi_ppc4xx_of_driver = {
|
||||
.match_table = spi_ppc4xx_of_match,
|
||||
.probe = spi_ppc4xx_of_probe,
|
||||
.remove = __exit_p(spi_ppc4xx_of_remove),
|
||||
.driver = {
|
||||
.name = DRIVER_NAME,
|
||||
.owner = THIS_MODULE,
|
||||
.of_match_table = spi_ppc4xx_of_match,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -109,12 +109,12 @@ static const struct of_device_id xilinx_spi_of_match[] = {
|
|||
MODULE_DEVICE_TABLE(of, xilinx_spi_of_match);
|
||||
|
||||
static struct of_platform_driver xilinx_spi_of_driver = {
|
||||
.match_table = xilinx_spi_of_match,
|
||||
.probe = xilinx_spi_of_probe,
|
||||
.remove = __exit_p(xilinx_spi_of_remove),
|
||||
.driver = {
|
||||
.name = "xilinx-xps-spi",
|
||||
.owner = THIS_MODULE,
|
||||
.of_match_table = xilinx_spi_of_match,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue