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/cpwd.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/cpwd.c')
-rw-r--r-- | drivers/watchdog/cpwd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c index 2fcc3cf7ef62..d62b9ce8f773 100644 --- a/drivers/watchdog/cpwd.c +++ b/drivers/watchdog/cpwd.c | |||
@@ -677,8 +677,11 @@ static const struct of_device_id cpwd_match[] = { | |||
677 | MODULE_DEVICE_TABLE(of, cpwd_match); | 677 | MODULE_DEVICE_TABLE(of, cpwd_match); |
678 | 678 | ||
679 | static struct of_platform_driver cpwd_driver = { | 679 | static struct of_platform_driver cpwd_driver = { |
680 | .name = DRIVER_NAME, | 680 | .driver = { |
681 | .match_table = cpwd_match, | 681 | .name = DRIVER_NAME, |
682 | .owner = THIS_MODULE, | ||
683 | .of_match_table = cpwd_match, | ||
684 | }, | ||
682 | .probe = cpwd_probe, | 685 | .probe = cpwd_probe, |
683 | .remove = __devexit_p(cpwd_remove), | 686 | .remove = __devexit_p(cpwd_remove), |
684 | }; | 687 | }; |