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>

4 files changed, 17 insertions, 9 deletions

diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c
index 0861d99cd75..0f9cbf1aaf1 100644
--- a/drivers/char/hw_random/n2-drv.c
+++ b/drivers/char/hw_random/n2-drv.c
@@ -751,8 +751,11 @@ static const struct of_device_id n2rng_match[] = {
 MODULE_DEVICE_TABLE(of, n2rng_match);
 
 static struct of_platform_driver n2rng_driver = {
-        .name           = "n2rng",
-        .match_table    = n2rng_match,
+        .driver = {
+                .name = "n2rng",
+                .owner = THIS_MODULE,
+                .of_match_table = n2rng_match,
+        },
         .probe          = n2rng_probe,
         .remove         = __devexit_p(n2rng_remove),
 };
diff --git a/drivers/char/hw_random/pasemi-rng.c b/drivers/char/hw_random/pasemi-rng.c
index b213855bae6..261ba8f22b8 100644
--- a/drivers/char/hw_random/pasemi-rng.c
+++ b/drivers/char/hw_random/pasemi-rng.c
@@ -140,8 +140,11 @@ static struct of_device_id rng_match[] = {
 };
 
 static struct of_platform_driver rng_driver = {
-        .name           = "pasemi-rng",
-        .match_table    = rng_match,
+        .driver = {
+                .name = "pasemi-rng",
+                .owner = THIS_MODULE,
+                .of_match_table = rng_match,
+        },
         .probe          = rng_probe,
         .remove         = rng_remove,
 };
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 2b44a0e1b98..47ffe4a90a9 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2555,8 +2555,11 @@ static struct of_device_id ipmi_match[] =
 };
 
 static struct of_platform_driver ipmi_of_platform_driver = {
-        .name           = "ipmi",
-        .match_table    = ipmi_match,
+        .driver = {
+                .name = "ipmi",
+                .owner = THIS_MODULE,
+                .of_match_table = ipmi_match,
+        },
         .probe          = ipmi_of_probe,
         .remove         = __devexit_p(ipmi_of_remove),
 };
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index 5a0a31e2029..ed8a9cec2a0 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -812,13 +812,12 @@ static const struct of_device_id __devinitconst hwicap_of_match[] = {
 MODULE_DEVICE_TABLE(of, hwicap_of_match);
 
 static struct of_platform_driver hwicap_of_driver = {
-        .owner = THIS_MODULE,
-        .name = DRIVER_NAME,
-        .match_table = hwicap_of_match,
         .probe = hwicap_of_probe,
         .remove = __devexit_p(hwicap_of_remove),
         .driver = {
                 .name = DRIVER_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = hwicap_of_match,
         },
 };