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/sja1000 | |
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/sja1000')
-rw-r--r-- | drivers/net/can/sja1000/sja1000_of_platform.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/can/sja1000/sja1000_of_platform.c b/drivers/net/can/sja1000/sja1000_of_platform.c index dc5f20cdf93..158b76ebf3e 100644 --- a/drivers/net/can/sja1000/sja1000_of_platform.c +++ b/drivers/net/can/sja1000/sja1000_of_platform.c | |||
@@ -216,11 +216,13 @@ static struct of_device_id __devinitdata sja1000_ofp_table[] = { | |||
216 | MODULE_DEVICE_TABLE(of, sja1000_ofp_table); | 216 | MODULE_DEVICE_TABLE(of, sja1000_ofp_table); |
217 | 217 | ||
218 | static struct of_platform_driver sja1000_ofp_driver = { | 218 | static struct of_platform_driver sja1000_ofp_driver = { |
219 | .owner = THIS_MODULE, | 219 | .driver = { |
220 | .name = DRV_NAME, | 220 | .owner = THIS_MODULE, |
221 | .name = DRV_NAME, | ||
222 | .of_match_table = sja1000_ofp_table, | ||
223 | }, | ||
221 | .probe = sja1000_ofp_probe, | 224 | .probe = sja1000_ofp_probe, |
222 | .remove = __devexit_p(sja1000_ofp_remove), | 225 | .remove = __devexit_p(sja1000_ofp_remove), |
223 | .match_table = sja1000_ofp_table, | ||
224 | }; | 226 | }; |
225 | 227 | ||
226 | static int __init sja1000_ofp_init(void) | 228 | static int __init sja1000_ofp_init(void) |