aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ibm_newemac/zmii.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-04-13 19:13:02 -0400
committerGrant Likely <grant.likely@secretlab.ca>2010-05-22 02:10:40 -0400
commit4018294b53d1dae026880e45f174c1cc63b5d435 (patch)
tree6db3538eaf91b653381720a6d92f4f15634a93d0 /drivers/net/ibm_newemac/zmii.c
parent597b9d1e44e9ba69f2454a5318bbe7a6d5e6930a (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/ibm_newemac/zmii.c')
-rw-r--r--drivers/net/ibm_newemac/zmii.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ibm_newemac/zmii.c b/drivers/net/ibm_newemac/zmii.c
index b4fa823ed201..046dcd069c45 100644
--- a/drivers/net/ibm_newemac/zmii.c
+++ b/drivers/net/ibm_newemac/zmii.c
@@ -313,9 +313,11 @@ static struct of_device_id zmii_match[] =
313}; 313};
314 314
315static struct of_platform_driver zmii_driver = { 315static struct of_platform_driver zmii_driver = {
316 .name = "emac-zmii", 316 .driver = {
317 .match_table = zmii_match, 317 .name = "emac-zmii",
318 318 .owner = THIS_MODULE,
319 .of_match_table = zmii_match,
320 },
319 .probe = zmii_probe, 321 .probe = zmii_probe,
320 .remove = zmii_remove, 322 .remove = zmii_remove,
321}; 323};