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/char/xilinx_hwicap | |
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/char/xilinx_hwicap')
-rw-r--r-- | drivers/char/xilinx_hwicap/xilinx_hwicap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c index 5a0a31e2029c..ed8a9cec2a05 100644 --- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c +++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c | |||
@@ -812,13 +812,12 @@ static const struct of_device_id __devinitconst hwicap_of_match[] = { | |||
812 | MODULE_DEVICE_TABLE(of, hwicap_of_match); | 812 | MODULE_DEVICE_TABLE(of, hwicap_of_match); |
813 | 813 | ||
814 | static struct of_platform_driver hwicap_of_driver = { | 814 | static struct of_platform_driver hwicap_of_driver = { |
815 | .owner = THIS_MODULE, | ||
816 | .name = DRIVER_NAME, | ||
817 | .match_table = hwicap_of_match, | ||
818 | .probe = hwicap_of_probe, | 815 | .probe = hwicap_of_probe, |
819 | .remove = __devexit_p(hwicap_of_remove), | 816 | .remove = __devexit_p(hwicap_of_remove), |
820 | .driver = { | 817 | .driver = { |
821 | .name = DRIVER_NAME, | 818 | .name = DRIVER_NAME, |
819 | .owner = THIS_MODULE, | ||
820 | .of_match_table = hwicap_of_match, | ||
822 | }, | 821 | }, |
823 | }; | 822 | }; |
824 | 823 | ||