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>

5 files changed, 13 insertions, 10 deletions

diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c
index 7fcf28405860..7104cb739da7 100644
--- a/drivers/spi/mpc52xx_psc_spi.c
+++ b/drivers/spi/mpc52xx_psc_spi.c
@@ -514,14 +514,12 @@ static const struct of_device_id mpc52xx_psc_spi_of_match[] = {
 MODULE_DEVICE_TABLE(of, mpc52xx_psc_spi_of_match);
 
 static struct of_platform_driver mpc52xx_psc_spi_of_driver = {
-        .owner = THIS_MODULE,
-        .name = "mpc52xx-psc-spi",
-        .match_table = mpc52xx_psc_spi_of_match,
         .probe = mpc52xx_psc_spi_of_probe,
         .remove = __exit_p(mpc52xx_psc_spi_of_remove),
         .driver = {
                 .name = "mpc52xx-psc-spi",
                 .owner = THIS_MODULE,
+                .of_match_table = mpc52xx_psc_spi_of_match,
         },
 };
 
diff --git a/drivers/spi/mpc52xx_spi.c b/drivers/spi/mpc52xx_spi.c
index 6573233bf7c9..b1a76bff775f 100644
--- a/drivers/spi/mpc52xx_spi.c
+++ b/drivers/spi/mpc52xx_spi.c
@@ -558,9 +558,11 @@ static const struct of_device_id mpc52xx_spi_match[] __devinitconst = {
 MODULE_DEVICE_TABLE(of, mpc52xx_spi_match);
 
 static struct of_platform_driver mpc52xx_spi_of_driver = {
-        .owner = THIS_MODULE,
-        .name = "mpc52xx-spi",
-        .match_table = mpc52xx_spi_match,
+        .driver = {
+                .name = "mpc52xx-spi",
+                .owner = THIS_MODULE,
+                .of_match_table = mpc52xx_spi_match,
+        },
         .probe = mpc52xx_spi_probe,
         .remove = __exit_p(mpc52xx_spi_remove),
 };
diff --git a/drivers/spi/spi_mpc8xxx.c b/drivers/spi/spi_mpc8xxx.c
index 7572f98a419e..77ab15e330d0 100644
--- a/drivers/spi/spi_mpc8xxx.c
+++ b/drivers/spi/spi_mpc8xxx.c
@@ -1312,8 +1312,11 @@ static const struct of_device_id of_mpc8xxx_spi_match[] = {
 MODULE_DEVICE_TABLE(of, of_mpc8xxx_spi_match);
 
 static struct of_platform_driver of_mpc8xxx_spi_driver = {
-        .name           = "mpc8xxx_spi",
-        .match_table    = of_mpc8xxx_spi_match,
+        .driver = {
+                .name = "mpc8xxx_spi",
+                .owner = THIS_MODULE,
+                .of_match_table = of_mpc8xxx_spi_match,
+        },
         .probe          = of_mpc8xxx_spi_probe,
         .remove         = __devexit_p(of_mpc8xxx_spi_remove),
 };
diff --git a/drivers/spi/spi_ppc4xx.c b/drivers/spi/spi_ppc4xx.c
index 7cb5ff37f6e2..19c0b3b34fce 100644
--- a/drivers/spi/spi_ppc4xx.c
+++ b/drivers/spi/spi_ppc4xx.c
@@ -587,12 +587,12 @@ static const struct of_device_id spi_ppc4xx_of_match[] = {
 MODULE_DEVICE_TABLE(of, spi_ppc4xx_of_match);
 
 static struct of_platform_driver spi_ppc4xx_of_driver = {
-        .match_table = spi_ppc4xx_of_match,
         .probe = spi_ppc4xx_of_probe,
         .remove = __exit_p(spi_ppc4xx_of_remove),
         .driver = {
                 .name = DRIVER_NAME,
                 .owner = THIS_MODULE,
+                .of_match_table = spi_ppc4xx_of_match,
         },
 };
 
diff --git a/drivers/spi/xilinx_spi_of.c b/drivers/spi/xilinx_spi_of.c
index 748d33a76d29..55c58012a028 100644
--- a/drivers/spi/xilinx_spi_of.c
+++ b/drivers/spi/xilinx_spi_of.c
@@ -109,12 +109,12 @@ static const struct of_device_id xilinx_spi_of_match[] = {
 MODULE_DEVICE_TABLE(of, xilinx_spi_of_match);
 
 static struct of_platform_driver xilinx_spi_of_driver = {
-        .match_table = xilinx_spi_of_match,
         .probe = xilinx_spi_of_probe,
         .remove = __exit_p(xilinx_spi_of_remove),
         .driver = {
                 .name = "xilinx-xps-spi",
                 .owner = THIS_MODULE,
+                .of_match_table = xilinx_spi_of_match,
         },
 };