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/gianfar.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/net/gianfar.c')
-rw-r--r-- | drivers/net/gianfar.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index b71bba91064c..c3b292a31328 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
@@ -3054,14 +3054,16 @@ MODULE_DEVICE_TABLE(of, gfar_match); | |||
3054 | 3054 | ||
3055 | /* Structure for a device driver */ | 3055 | /* Structure for a device driver */ |
3056 | static struct of_platform_driver gfar_driver = { | 3056 | static struct of_platform_driver gfar_driver = { |
3057 | .name = "fsl-gianfar", | 3057 | .driver = { |
3058 | .match_table = gfar_match, | 3058 | .name = "fsl-gianfar", |
3059 | 3059 | .owner = THIS_MODULE, | |
3060 | .pm = GFAR_PM_OPS, | ||
3061 | .of_match_table = gfar_match, | ||
3062 | }, | ||
3060 | .probe = gfar_probe, | 3063 | .probe = gfar_probe, |
3061 | .remove = gfar_remove, | 3064 | .remove = gfar_remove, |
3062 | .suspend = gfar_legacy_suspend, | 3065 | .suspend = gfar_legacy_suspend, |
3063 | .resume = gfar_legacy_resume, | 3066 | .resume = gfar_legacy_resume, |
3064 | .driver.pm = GFAR_PM_OPS, | ||
3065 | }; | 3067 | }; |
3066 | 3068 | ||
3067 | static int __init gfar_init(void) | 3069 | static int __init gfar_init(void) |