diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-04-13 19:13:02 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:10:40 -0400 |
commit | 4018294b53d1dae026880e45f174c1cc63b5d435 (patch) | |
tree | 6db3538eaf91b653381720a6d92f4f15634a93d0 /drivers/watchdog/mpc8xxx_wdt.c | |
parent | 597b9d1e44e9ba69f2454a5318bbe7a6d5e6930a (diff) |
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 <grant.likely@secretlab.ca>
Acked-by: Sean MacLennan <smaclennan@pikatech.com>
Diffstat (limited to 'drivers/watchdog/mpc8xxx_wdt.c')
-rw-r--r-- | drivers/watchdog/mpc8xxx_wdt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c index 4e3941c5e293..7b55974191dd 100644 --- a/drivers/watchdog/mpc8xxx_wdt.c +++ b/drivers/watchdog/mpc8xxx_wdt.c | |||
@@ -273,12 +273,12 @@ static const struct of_device_id mpc8xxx_wdt_match[] = { | |||
273 | MODULE_DEVICE_TABLE(of, mpc8xxx_wdt_match); | 273 | MODULE_DEVICE_TABLE(of, mpc8xxx_wdt_match); |
274 | 274 | ||
275 | static struct of_platform_driver mpc8xxx_wdt_driver = { | 275 | static struct of_platform_driver mpc8xxx_wdt_driver = { |
276 | .match_table = mpc8xxx_wdt_match, | ||
277 | .probe = mpc8xxx_wdt_probe, | 276 | .probe = mpc8xxx_wdt_probe, |
278 | .remove = __devexit_p(mpc8xxx_wdt_remove), | 277 | .remove = __devexit_p(mpc8xxx_wdt_remove), |
279 | .driver = { | 278 | .driver = { |
280 | .name = "mpc8xxx_wdt", | 279 | .name = "mpc8xxx_wdt", |
281 | .owner = THIS_MODULE, | 280 | .owner = THIS_MODULE, |
281 | .of_match_table = mpc8xxx_wdt_match, | ||
282 | }, | 282 | }, |
283 | }; | 283 | }; |
284 | 284 | ||