2 files changed, 17 insertions, 23 deletions

diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
index 4471647b4807..6c1886b497ff 100644
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
@@ -338,15 +338,13 @@ static struct of_device_id mpc85xx_pci_err_of_match[] = {
 };
 
 static struct of_platform_driver mpc85xx_pci_err_driver = {
-        .owner = THIS_MODULE,
-        .name = "mpc85xx_pci_err",
-        .match_table = mpc85xx_pci_err_of_match,
         .probe = mpc85xx_pci_err_probe,
         .remove = __devexit_p(mpc85xx_pci_err_remove),
         .driver = {
-                   .name = "mpc85xx_pci_err",
-                   .owner = THIS_MODULE,
-                   },
+                .name = "mpc85xx_pci_err",
+                .owner = THIS_MODULE,
+                .of_match_table = mpc85xx_pci_err_of_match,
+        },
 };
 
 #endif                          /* CONFIG_PCI */
@@ -654,15 +652,13 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = {
 };
 
 static struct of_platform_driver mpc85xx_l2_err_driver = {
-        .owner = THIS_MODULE,
-        .name = "mpc85xx_l2_err",
-        .match_table = mpc85xx_l2_err_of_match,
         .probe = mpc85xx_l2_err_probe,
         .remove = mpc85xx_l2_err_remove,
         .driver = {
-                   .name = "mpc85xx_l2_err",
-                   .owner = THIS_MODULE,
-                   },
+                .name = "mpc85xx_l2_err",
+                .owner = THIS_MODULE,
+                .of_match_table = mpc85xx_l2_err_of_match,
+        },
 };
 
 /**************************** MC Err device ***************************/
@@ -1131,15 +1127,13 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = {
 };
 
 static struct of_platform_driver mpc85xx_mc_err_driver = {
-        .owner = THIS_MODULE,
-        .name = "mpc85xx_mc_err",
-        .match_table = mpc85xx_mc_err_of_match,
         .probe = mpc85xx_mc_err_probe,
         .remove = mpc85xx_mc_err_remove,
         .driver = {
-                   .name = "mpc85xx_mc_err",
-                   .owner = THIS_MODULE,
-                   },
+                .name = "mpc85xx_mc_err",
+                .owner = THIS_MODULE,
+                .of_match_table = mpc85xx_mc_err_of_match,
+        },
 };
 
 #ifdef CONFIG_MPC85xx
diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c
index 11f2172aa1e6..9d6f6783328c 100644
--- a/drivers/edac/ppc4xx_edac.c
+++ b/drivers/edac/ppc4xx_edac.c
@@ -202,13 +202,13 @@ static struct of_device_id ppc4xx_edac_match[] = {
 };
 
 static struct of_platform_driver ppc4xx_edac_driver = {
-        .match_table            = ppc4xx_edac_match,
         .probe                  = ppc4xx_edac_probe,
         .remove                 = ppc4xx_edac_remove,
-        .driver                 = {
-                .owner  = THIS_MODULE,
-                .name   = PPC4XX_EDAC_MODULE_NAME
-        }
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = PPC4XX_EDAC_MODULE_NAME
+                .of_match_table = ppc4xx_edac_match,
+        },
 };
 
 /*