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, 31 insertions, 14 deletions

diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 3dc7a2fbf02..4147fe328c5 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -375,8 +375,11 @@ static struct of_device_id of_flash_match[] = {
 MODULE_DEVICE_TABLE(of, of_flash_match);
 
 static struct of_platform_driver of_flash_driver = {
-        .name           = "of-flash",
-        .match_table    = of_flash_match,
+        .driver = {
+                .name = "of-flash",
+                .owner = THIS_MODULE,
+                .of_match_table = of_flash_match,
+        },
         .probe          = of_flash_probe,
         .remove         = of_flash_remove,
 };
diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c
index 5945a23e681..0391c2527bd 100644
--- a/drivers/mtd/maps/sun_uflash.c
+++ b/drivers/mtd/maps/sun_uflash.c
@@ -149,8 +149,11 @@ static const struct of_device_id uflash_match[] = {
 MODULE_DEVICE_TABLE(of, uflash_match);
 
 static struct of_platform_driver uflash_driver = {
-        .name           = DRIVER_NAME,
-        .match_table    = uflash_match,
+        .driver = {
+                .name = DRIVER_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = uflash_match,
+        },
         .probe          = uflash_probe,
         .remove         = __devexit_p(uflash_remove),
 };
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index 4a6079588ab..f45a8d0c150 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -1078,9 +1078,10 @@ static const struct of_device_id fsl_elbc_match[] = {
 
 static struct of_platform_driver fsl_elbc_ctrl_driver = {
         .driver = {
-                .name   = "fsl-elbc",
+                .name = "fsl-elbc",
+                .owner = THIS_MODULE,
+                .of_match_table = fsl_elbc_match,
         },
-        .match_table = fsl_elbc_match,
         .probe = fsl_elbc_ctrl_probe,
         .remove = fsl_elbc_ctrl_remove,
 };
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index 4b96296af32..b7ab5a0ec35 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -357,8 +357,11 @@ static struct of_device_id of_fun_match[] = {
 MODULE_DEVICE_TABLE(of, of_fun_match);
 
 static struct of_platform_driver of_fun_driver = {
-        .name           = "fsl,upm-nand",
-        .match_table    = of_fun_match,
+        .driver = {
+                .name = "fsl,upm-nand",
+                .owner = THIS_MODULE,
+                .of_match_table = of_fun_match,
+        },
         .probe          = fun_probe,
         .remove         = __devexit_p(fun_remove),
 };
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index c0e05f5ff8a..98fd2bdf8be 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -294,9 +294,10 @@ MODULE_DEVICE_TABLE(of, ndfc_match);
 
 static struct of_platform_driver ndfc_driver = {
         .driver = {
-                .name   = "ndfc",
+                .name = "ndfc",
+                .owner = THIS_MODULE,
+                .of_match_table = ndfc_match,
         },
-        .match_table = ndfc_match,
         .probe = ndfc_probe,
         .remove = __devexit_p(ndfc_remove),
 };
diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
index edfc27b7851..a97e9c95ab6 100644
--- a/drivers/mtd/nand/pasemi_nand.c
+++ b/drivers/mtd/nand/pasemi_nand.c
@@ -221,8 +221,11 @@ MODULE_DEVICE_TABLE(of, pasemi_nand_match);
 
 static struct of_platform_driver pasemi_nand_driver =
 {
-        .name           = (char*)driver_name,
-        .match_table    = pasemi_nand_match,
+        .driver = {
+                .name = (char*)driver_name,
+                .owner = THIS_MODULE,
+                .of_match_table = pasemi_nand_match,
+        },
         .probe          = pasemi_nand_probe,
         .remove         = pasemi_nand_remove,
 };
diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c
index a4519a7bd68..edb9b138414 100644
--- a/drivers/mtd/nand/socrates_nand.c
+++ b/drivers/mtd/nand/socrates_nand.c
@@ -301,8 +301,11 @@ static struct of_device_id socrates_nand_match[] =
 MODULE_DEVICE_TABLE(of, socrates_nand_match);
 
 static struct of_platform_driver socrates_nand_driver = {
-        .name           = "socrates_nand",
-        .match_table    = socrates_nand_match,
+        .driver = {
+                .name = "socrates_nand",
+                .owner = THIS_MODULE,
+                .of_match_table = socrates_nand_match,
+        },
         .probe          = socrates_nand_probe,
         .remove         = __devexit_p(socrates_nand_remove),
 };