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/pcmcia/electra_cf.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/pcmcia/electra_cf.c')
-rw-r--r-- | drivers/pcmcia/electra_cf.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c index a22d32d71bf2..f94d8281cfb0 100644 --- a/drivers/pcmcia/electra_cf.c +++ b/drivers/pcmcia/electra_cf.c | |||
@@ -357,8 +357,11 @@ static const struct of_device_id electra_cf_match[] = { | |||
357 | MODULE_DEVICE_TABLE(of, electra_cf_match); | 357 | MODULE_DEVICE_TABLE(of, electra_cf_match); |
358 | 358 | ||
359 | static struct of_platform_driver electra_cf_driver = { | 359 | static struct of_platform_driver electra_cf_driver = { |
360 | .name = (char *)driver_name, | 360 | .driver = { |
361 | .match_table = electra_cf_match, | 361 | .name = (char *)driver_name, |
362 | .owner = THIS_MODULE, | ||
363 | .of_match_table = electra_cf_match, | ||
364 | }, | ||
362 | .probe = electra_cf_probe, | 365 | .probe = electra_cf_probe, |
363 | .remove = electra_cf_remove, | 366 | .remove = electra_cf_remove, |
364 | }; | 367 | }; |