1 files changed, 12 insertions, 31 deletions

diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
index a1e791ec25d3..4fe66fa183ec 100644
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
@@ -212,7 +212,7 @@ static irqreturn_t mpc85xx_pci_isr(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static int __devinit mpc85xx_pci_err_probe(struct platform_device *op)
+int __devinit mpc85xx_pci_err_probe(struct platform_device *op)
 {
         struct edac_pci_ctl_info *pci;
         struct mpc85xx_pci_pdata *pdata;
@@ -226,6 +226,16 @@ static int __devinit mpc85xx_pci_err_probe(struct platform_device *op)
         if (!pci)
                 return -ENOMEM;
 
+        /* make sure error reporting method is sane */
+        switch (edac_op_state) {
+        case EDAC_OPSTATE_POLL:
+        case EDAC_OPSTATE_INT:
+                break;
+        default:
+                edac_op_state = EDAC_OPSTATE_INT;
+                break;
+        }
+
         pdata = pci->pvt_info;
         pdata->name = "mpc85xx_pci_err";
         pdata->irq = NO_IRQ;
@@ -315,6 +325,7 @@ err:
         devres_release_group(&op->dev, mpc85xx_pci_err_probe);
         return res;
 }
+EXPORT_SYMBOL(mpc85xx_pci_err_probe);
 
 static int mpc85xx_pci_err_remove(struct platform_device *op)
 {
@@ -338,27 +349,6 @@ static int mpc85xx_pci_err_remove(struct platform_device *op)
         return 0;
 }
 
-static struct of_device_id mpc85xx_pci_err_of_match[] = {
-        {
-         .compatible = "fsl,mpc8540-pcix",
-         },
-        {
-         .compatible = "fsl,mpc8540-pci",
-        },
-        {},
-};
-MODULE_DEVICE_TABLE(of, mpc85xx_pci_err_of_match);
-
-static struct platform_driver mpc85xx_pci_err_driver = {
-        .probe = mpc85xx_pci_err_probe,
-        .remove = __devexit_p(mpc85xx_pci_err_remove),
-        .driver = {
-                .name = "mpc85xx_pci_err",
-                .owner = THIS_MODULE,
-                .of_match_table = mpc85xx_pci_err_of_match,
-        },
-};
-
 #endif                          /* CONFIG_PCI */
 
 /**************************** L2 Err device ***************************/
@@ -1210,12 +1200,6 @@ static int __init mpc85xx_mc_init(void)
         if (res)
                 printk(KERN_WARNING EDAC_MOD_STR "L2 fails to register\n");
 
-#ifdef CONFIG_PCI
-        res = platform_driver_register(&mpc85xx_pci_err_driver);
-        if (res)
-                printk(KERN_WARNING EDAC_MOD_STR "PCI fails to register\n");
-#endif
-
 #ifdef CONFIG_FSL_SOC_BOOKE
         pvr = mfspr(SPRN_PVR);
 
@@ -1252,9 +1236,6 @@ static void __exit mpc85xx_mc_exit(void)
                 on_each_cpu(mpc85xx_mc_restore_hid1, NULL, 0);
         }
 #endif
-#ifdef CONFIG_PCI
-        platform_driver_unregister(&mpc85xx_pci_err_driver);
-#endif
         platform_driver_unregister(&mpc85xx_l2_err_driver);
         platform_driver_unregister(&mpc85xx_mc_err_driver);
 }