mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -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
|
|
@ -718,13 +718,13 @@ static const struct of_device_id cpm_i2c_match[] = {
|
|||
MODULE_DEVICE_TABLE(of, cpm_i2c_match);
|
||||
|
||||
static struct of_platform_driver cpm_i2c_driver = {
|
||||
.match_table = cpm_i2c_match,
|
||||
.probe = cpm_i2c_probe,
|
||||
.remove = __devexit_p(cpm_i2c_remove),
|
||||
.driver = {
|
||||
.name = "fsl-i2c-cpm",
|
||||
.owner = THIS_MODULE,
|
||||
}
|
||||
.driver = {
|
||||
.name = "fsl-i2c-cpm",
|
||||
.owner = THIS_MODULE,
|
||||
.of_match_table = cpm_i2c_match,
|
||||
},
|
||||
};
|
||||
|
||||
static int __init cpm_i2c_init(void)
|
||||
|
|
|
|||
|
|
@ -807,8 +807,11 @@ static const struct of_device_id ibm_iic_match[] = {
|
|||
};
|
||||
|
||||
static struct of_platform_driver ibm_iic_driver = {
|
||||
.name = "ibm-iic",
|
||||
.match_table = ibm_iic_match,
|
||||
.driver = {
|
||||
.name = "ibm-iic",
|
||||
.owner = THIS_MODULE,
|
||||
.of_match_table = ibm_iic_match,
|
||||
},
|
||||
.probe = iic_probe,
|
||||
.remove = __devexit_p(iic_remove),
|
||||
};
|
||||
|
|
|
|||
|
|
@ -675,12 +675,12 @@ MODULE_DEVICE_TABLE(of, mpc_i2c_of_match);
|
|||
|
||||
/* Structure for a device driver */
|
||||
static struct of_platform_driver mpc_i2c_driver = {
|
||||
.match_table = mpc_i2c_of_match,
|
||||
.probe = fsl_i2c_probe,
|
||||
.remove = __devexit_p(fsl_i2c_remove),
|
||||
.driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = DRV_NAME,
|
||||
.driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = DRV_NAME,
|
||||
.of_match_table = mpc_i2c_of_match,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue