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/ll_temac_main.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/ll_temac_main.c')
-rw-r--r-- | drivers/net/ll_temac_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c index 9c7395c10e44..dc318330ec79 100644 --- a/drivers/net/ll_temac_main.c +++ b/drivers/net/ll_temac_main.c | |||
@@ -955,12 +955,12 @@ static struct of_device_id temac_of_match[] __devinitdata = { | |||
955 | MODULE_DEVICE_TABLE(of, temac_of_match); | 955 | MODULE_DEVICE_TABLE(of, temac_of_match); |
956 | 956 | ||
957 | static struct of_platform_driver temac_of_driver = { | 957 | static struct of_platform_driver temac_of_driver = { |
958 | .match_table = temac_of_match, | ||
959 | .probe = temac_of_probe, | 958 | .probe = temac_of_probe, |
960 | .remove = __devexit_p(temac_of_remove), | 959 | .remove = __devexit_p(temac_of_remove), |
961 | .driver = { | 960 | .driver = { |
962 | .owner = THIS_MODULE, | 961 | .owner = THIS_MODULE, |
963 | .name = "xilinx_temac", | 962 | .name = "xilinx_temac", |
963 | .of_match_table = temac_of_match, | ||
964 | }, | 964 | }, |
965 | }; | 965 | }; |
966 | 966 | ||