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>

6 files changed, 22 insertions, 11 deletions

diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c
index 3dbc7f7cd7b9..e2ee220bfb7e 100644
--- a/sound/soc/fsl/mpc5200_psc_ac97.c
+++ b/sound/soc/fsl/mpc5200_psc_ac97.c
@@ -317,12 +317,12 @@ static struct of_device_id psc_ac97_match[] __devinitdata = {
 MODULE_DEVICE_TABLE(of, psc_ac97_match);
 
 static struct of_platform_driver psc_ac97_driver = {
-        .match_table = psc_ac97_match,
         .probe = psc_ac97_of_probe,
         .remove = __devexit_p(psc_ac97_of_remove),
         .driver = {
                 .name = "mpc5200-psc-ac97",
                 .owner = THIS_MODULE,
+                .of_match_table = psc_ac97_match,
         },
 };
 
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c
index 748cc0f0df38..4f455bd6851f 100644
--- a/sound/soc/fsl/mpc5200_psc_i2s.c
+++ b/sound/soc/fsl/mpc5200_psc_i2s.c
@@ -220,12 +220,12 @@ static struct of_device_id psc_i2s_match[] __devinitdata = {
 MODULE_DEVICE_TABLE(of, psc_i2s_match);
 
 static struct of_platform_driver psc_i2s_driver = {
-        .match_table = psc_i2s_match,
         .probe = psc_i2s_of_probe,
         .remove = __devexit_p(psc_i2s_of_remove),
         .driver = {
                 .name = "mpc5200-psc-i2s",
                 .owner = THIS_MODULE,
+                .of_match_table = psc_i2s_match,
         },
 };
 
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
index e3f78f255a60..6a2764ee8203 100644
--- a/sound/soc/fsl/mpc8610_hpcd.c
+++ b/sound/soc/fsl/mpc8610_hpcd.c
@@ -580,9 +580,11 @@ static struct of_device_id mpc8610_hpcd_match[] = {
 MODULE_DEVICE_TABLE(of, mpc8610_hpcd_match);
 
 static struct of_platform_driver mpc8610_hpcd_of_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "mpc8610_hpcd",
-        .match_table    = mpc8610_hpcd_match,
+        .driver = {
+                .name = "mpc8610_hpcd",
+                .owner = THIS_MODULE,
+                .of_match_table = mpc8610_hpcd_match,
+        },
         .probe          = mpc8610_hpcd_probe,
         .remove         = mpc8610_hpcd_remove,
 };
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index 574af56ba8a6..71221fd20944 100644
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -1065,8 +1065,11 @@ static const struct of_device_id amd7930_match[] = {
 };
 
 static struct of_platform_driver amd7930_sbus_driver = {
-        .name           = "audio",
-        .match_table    = amd7930_match,
+        .driver = {
+                .name = "audio",
+                .owner = THIS_MODULE,
+                .of_match_table = amd7930_match,
+        },
         .probe          = amd7930_sbus_probe,
 };
 
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index 6a4c872e00df..fb4c6f2f29e5 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -2109,8 +2109,11 @@ static const struct of_device_id cs4231_match[] = {
 MODULE_DEVICE_TABLE(of, cs4231_match);
 
 static struct of_platform_driver cs4231_driver = {
-        .name           = "audio",
-        .match_table    = cs4231_match,
+        .driver = {
+                .name = "audio",
+                .owner = THIS_MODULE,
+                .of_match_table = cs4231_match,
+        },
         .probe          = cs4231_probe,
         .remove         = __devexit_p(cs4231_remove),
 };
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index 1b5192eb5ae5..1557bf132e73 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -2687,8 +2687,11 @@ static const struct of_device_id dbri_match[] = {
 MODULE_DEVICE_TABLE(of, dbri_match);
 
 static struct of_platform_driver dbri_sbus_driver = {
-        .name           = "dbri",
-        .match_table    = dbri_match,
+        .driver = {
+                .name = "dbri",
+                .owner = THIS_MODULE,
+                .of_match_table = dbri_match,
+        },
         .probe          = dbri_probe,
         .remove         = __devexit_p(dbri_remove),
 };