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>

7 files changed, 35 insertions, 18 deletions

diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c b/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
index 576669fc4fbf..ca5305a5bd61 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpio.c
@@ -193,8 +193,11 @@ static const struct of_device_id mpc52xx_wkup_gpiochip_match[] = {
 };
 
 static struct of_platform_driver mpc52xx_wkup_gpiochip_driver = {
-        .name = "gpio_wkup",
-        .match_table = mpc52xx_wkup_gpiochip_match,
+        .driver = {
+                .name = "gpio_wkup",
+                .owner = THIS_MODULE,
+                .of_match_table = mpc52xx_wkup_gpiochip_match,
+        },
         .probe = mpc52xx_wkup_gpiochip_probe,
         .remove = mpc52xx_gpiochip_remove,
 };
@@ -349,8 +352,11 @@ static const struct of_device_id mpc52xx_simple_gpiochip_match[] = {
 };
 
 static struct of_platform_driver mpc52xx_simple_gpiochip_driver = {
-        .name = "gpio",
-        .match_table = mpc52xx_simple_gpiochip_match,
+        .driver = {
+                .name = "gpio",
+                .owner = THIS_MODULE,
+                .of_match_table = mpc52xx_simple_gpiochip_match,
+        },
         .probe = mpc52xx_simple_gpiochip_probe,
         .remove = mpc52xx_gpiochip_remove,
 };
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
index 42c507f9c35b..46c93578cbf0 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
@@ -784,8 +784,11 @@ static const struct of_device_id mpc52xx_gpt_match[] = {
 };
 
 static struct of_platform_driver mpc52xx_gpt_driver = {
-        .name = "mpc52xx-gpt",
-        .match_table = mpc52xx_gpt_match,
+        .driver = {
+                .name = "mpc52xx-gpt",
+                .owner = THIS_MODULE,
+                .of_match_table = mpc52xx_gpt_match,
+        },
         .probe = mpc52xx_gpt_probe,
         .remove = mpc52xx_gpt_remove,
 };
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
index 17b99ba7a8cc..e86aec644501 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
@@ -537,9 +537,11 @@ static struct of_device_id mpc52xx_lpbfifo_match[] __devinitconst = {
 };
 
 static struct of_platform_driver mpc52xx_lpbfifo_driver = {
-        .owner = THIS_MODULE,
-        .name = "mpc52xx-lpbfifo",
-        .match_table = mpc52xx_lpbfifo_match,
+        .driver = {
+                .name = "mpc52xx-lpbfifo",
+                .owner = THIS_MODULE,
+                .of_match_table = mpc52xx_lpbfifo_match,
+        },
         .probe = mpc52xx_lpbfifo_probe,
         .remove = __devexit_p(mpc52xx_lpbfifo_remove),
 };
diff --git a/arch/powerpc/platforms/82xx/ep8248e.c b/arch/powerpc/platforms/82xx/ep8248e.c
index 0176ae8249d5..9f2e52b36f91 100644
--- a/arch/powerpc/platforms/82xx/ep8248e.c
+++ b/arch/powerpc/platforms/82xx/ep8248e.c
@@ -170,8 +170,9 @@ static const struct of_device_id ep8248e_mdio_match[] = {
 static struct of_platform_driver ep8248e_mdio_driver = {
         .driver = {
                 .name = "ep8248e-mdio-bitbang",
+                .owner = THIS_MODULE,
+                .of_match_table = ep8248e_mdio_match,
         },
-        .match_table = ep8248e_mdio_match,
         .probe = ep8248e_mdio_probe,
         .remove = ep8248e_mdio_remove,
 };
diff --git a/arch/powerpc/platforms/83xx/suspend.c b/arch/powerpc/platforms/83xx/suspend.c
index aa0b764b1cc4..ebe6c3537209 100644
--- a/arch/powerpc/platforms/83xx/suspend.c
+++ b/arch/powerpc/platforms/83xx/suspend.c
@@ -423,8 +423,11 @@ static struct of_device_id pmc_match[] = {
 };
 
 static struct of_platform_driver pmc_driver = {
-        .name = "mpc83xx-pmc",
-        .match_table = pmc_match,
+        .driver = {
+                .name = "mpc83xx-pmc",
+                .owner = THIS_MODULE,
+                .of_match_table = pmc_match,
+        },
         .probe = pmc_probe,
         .remove = pmc_remove
 };
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
index 177a4f1369b4..6257e5378615 100644
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -447,11 +447,12 @@ static const struct of_device_id axon_msi_device_id[] = {
 };
 
 static struct of_platform_driver axon_msi_driver = {
-        .match_table    = axon_msi_device_id,
         .probe          = axon_msi_probe,
         .shutdown       = axon_msi_shutdown,
-        .driver         = {
-                .name   = "axon-msi"
+        .driver = {
+                .name = "axon-msi",
+                .owner = THIS_MODULE,
+                .of_match_table = axon_msi_device_id,
         },
 };
 
diff --git a/arch/powerpc/platforms/pasemi/gpio_mdio.c b/arch/powerpc/platforms/pasemi/gpio_mdio.c
index c44e1b3b91db..627ee089e75d 100644
--- a/arch/powerpc/platforms/pasemi/gpio_mdio.c
+++ b/arch/powerpc/platforms/pasemi/gpio_mdio.c
@@ -301,11 +301,12 @@ MODULE_DEVICE_TABLE(of, gpio_mdio_match);
 
 static struct of_platform_driver gpio_mdio_driver =
 {
-        .match_table    = gpio_mdio_match,
         .probe          = gpio_mdio_probe,
         .remove         = gpio_mdio_remove,
-        .driver         = {
-                .name   = "gpio-mdio-bitbang",
+        .driver = {
+                .name = "gpio-mdio-bitbang",
+                .owner = THIS_MODULE,
+                .of_match_table = gpio_mdio_match,
         },
 };