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/net/can/mscan | |
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/net/can/mscan')
-rw-r--r-- | drivers/net/can/mscan/mpc5xxx_can.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c index 03e7c48465a2..2120784f8db4 100644 --- a/drivers/net/can/mscan/mpc5xxx_can.c +++ b/drivers/net/can/mscan/mpc5xxx_can.c | |||
@@ -393,15 +393,17 @@ static struct of_device_id __devinitdata mpc5xxx_can_table[] = { | |||
393 | }; | 393 | }; |
394 | 394 | ||
395 | static struct of_platform_driver mpc5xxx_can_driver = { | 395 | static struct of_platform_driver mpc5xxx_can_driver = { |
396 | .owner = THIS_MODULE, | 396 | .driver = { |
397 | .name = "mpc5xxx_can", | 397 | .name = "mpc5xxx_can", |
398 | .owner = THIS_MODULE, | ||
399 | .of_match_table = mpc5xxx_can_table, | ||
400 | }, | ||
398 | .probe = mpc5xxx_can_probe, | 401 | .probe = mpc5xxx_can_probe, |
399 | .remove = __devexit_p(mpc5xxx_can_remove), | 402 | .remove = __devexit_p(mpc5xxx_can_remove), |
400 | #ifdef CONFIG_PM | 403 | #ifdef CONFIG_PM |
401 | .suspend = mpc5xxx_can_suspend, | 404 | .suspend = mpc5xxx_can_suspend, |
402 | .resume = mpc5xxx_can_resume, | 405 | .resume = mpc5xxx_can_resume, |
403 | #endif | 406 | #endif |
404 | .match_table = mpc5xxx_can_table, | ||
405 | }; | 407 | }; |
406 | 408 | ||
407 | static int __init mpc5xxx_can_init(void) | 409 | static int __init mpc5xxx_can_init(void) |