aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/xilinx_emaclite.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/xilinx_emaclite.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/xilinx_emaclite.c')
-rw-r--r--drivers/net/xilinx_emaclite.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index 3dd2416db540..67f9237237dd 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -1293,8 +1293,11 @@ static struct of_device_id xemaclite_of_match[] __devinitdata = {
1293MODULE_DEVICE_TABLE(of, xemaclite_of_match); 1293MODULE_DEVICE_TABLE(of, xemaclite_of_match);
1294 1294
1295static struct of_platform_driver xemaclite_of_driver = { 1295static struct of_platform_driver xemaclite_of_driver = {
1296 .name = DRIVER_NAME, 1296 .driver = {
1297 .match_table = xemaclite_of_match, 1297 .name = DRIVER_NAME,
1298 .owner = THIS_MODULE,
1299 .of_match_table = xemaclite_of_match,
1300 },
1298 .probe = xemaclite_of_probe, 1301 .probe = xemaclite_of_probe,
1299 .remove = __devexit_p(xemaclite_of_remove), 1302 .remove = __devexit_p(xemaclite_of_remove),
1300}; 1303};