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/sunbmac.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/sunbmac.c')
-rw-r--r-- | drivers/net/sunbmac.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c index bd286ec5abd9..5f0ec390d6fc 100644 --- a/drivers/net/sunbmac.c +++ b/drivers/net/sunbmac.c | |||
@@ -1292,8 +1292,11 @@ static const struct of_device_id bigmac_sbus_match[] = { | |||
1292 | MODULE_DEVICE_TABLE(of, bigmac_sbus_match); | 1292 | MODULE_DEVICE_TABLE(of, bigmac_sbus_match); |
1293 | 1293 | ||
1294 | static struct of_platform_driver bigmac_sbus_driver = { | 1294 | static struct of_platform_driver bigmac_sbus_driver = { |
1295 | .name = "sunbmac", | 1295 | .driver = { |
1296 | .match_table = bigmac_sbus_match, | 1296 | .name = "sunbmac", |
1297 | .owner = THIS_MODULE, | ||
1298 | .of_match_table = bigmac_sbus_match, | ||
1299 | }, | ||
1297 | .probe = bigmac_sbus_probe, | 1300 | .probe = bigmac_sbus_probe, |
1298 | .remove = __devexit_p(bigmac_sbus_remove), | 1301 | .remove = __devexit_p(bigmac_sbus_remove), |
1299 | }; | 1302 | }; |