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>

1 files changed, 12 insertions, 18 deletions

diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
index 4471647b4807..6c1886b497ff 100644
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
@@ -338,15 +338,13 @@ static struct of_device_id mpc85xx_pci_err_of_match[] = {
 };
 
 static struct of_platform_driver mpc85xx_pci_err_driver = {
-        .owner = THIS_MODULE,
-        .name = "mpc85xx_pci_err",
-        .match_table = mpc85xx_pci_err_of_match,
         .probe = mpc85xx_pci_err_probe,
         .remove = __devexit_p(mpc85xx_pci_err_remove),
         .driver = {
-                   .name = "mpc85xx_pci_err",
-                   .owner = THIS_MODULE,
-                   },
+                .name = "mpc85xx_pci_err",
+                .owner = THIS_MODULE,
+                .of_match_table = mpc85xx_pci_err_of_match,
+        },
 };
 
 #endif                          /* CONFIG_PCI */
@@ -654,15 +652,13 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = {
 };
 
 static struct of_platform_driver mpc85xx_l2_err_driver = {
-        .owner = THIS_MODULE,
-        .name = "mpc85xx_l2_err",
-        .match_table = mpc85xx_l2_err_of_match,
         .probe = mpc85xx_l2_err_probe,
         .remove = mpc85xx_l2_err_remove,
         .driver = {
-                   .name = "mpc85xx_l2_err",
-                   .owner = THIS_MODULE,
-                   },
+                .name = "mpc85xx_l2_err",
+                .owner = THIS_MODULE,
+                .of_match_table = mpc85xx_l2_err_of_match,
+        },
 };
 
 /**************************** MC Err device ***************************/
@@ -1131,15 +1127,13 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = {
 };
 
 static struct of_platform_driver mpc85xx_mc_err_driver = {
-        .owner = THIS_MODULE,
-        .name = "mpc85xx_mc_err",
-        .match_table = mpc85xx_mc_err_of_match,
         .probe = mpc85xx_mc_err_probe,
         .remove = mpc85xx_mc_err_remove,
         .driver = {
-                   .name = "mpc85xx_mc_err",
-                   .owner = THIS_MODULE,
-                   },
+                .name = "mpc85xx_mc_err",
+                .owner = THIS_MODULE,
+                .of_match_table = mpc85xx_mc_err_of_match,
+        },
 };
 
 #ifdef CONFIG_MPC85xx