1 files changed, 20 insertions, 20 deletions

diff --git a/drivers/edac/mv64x60_edac.c b/drivers/edac/mv64x60_edac.c
index b0bb5a3d2527..2b315c2edc3c 100644
--- a/drivers/edac/mv64x60_edac.c
+++ b/drivers/edac/mv64x60_edac.c
@@ -169,7 +169,7 @@ static int __devinit mv64x60_pci_err_probe(struct platform_device *pdev)
                  MV64X60_PCIx_ERR_MASK_VAL);
 
         if (edac_pci_add_device(pci, pdata->edac_idx) > 0) {
-                debugf3("%s(): failed edac_pci_add_device()\n", __func__);
+                edac_dbg(3, "failed edac_pci_add_device()\n");
                 goto err;
         }
 
@@ -194,7 +194,7 @@ static int __devinit mv64x60_pci_err_probe(struct platform_device *pdev)
         devres_remove_group(&pdev->dev, mv64x60_pci_err_probe);
 
         /* get this far and it's successful */
-        debugf3("%s(): success\n", __func__);
+        edac_dbg(3, "success\n");
 
         return 0;
 
@@ -210,7 +210,7 @@ static int mv64x60_pci_err_remove(struct platform_device *pdev)
 {
         struct edac_pci_ctl_info *pci = platform_get_drvdata(pdev);
 
-        debugf0("%s()\n", __func__);
+        edac_dbg(0, "\n");
 
         edac_pci_del_device(&pdev->dev);
 
@@ -336,7 +336,7 @@ static int __devinit mv64x60_sram_err_probe(struct platform_device *pdev)
         pdata->edac_idx = edac_dev_idx++;
 
         if (edac_device_add_device(edac_dev) > 0) {
-                debugf3("%s(): failed edac_device_add_device()\n", __func__);
+                edac_dbg(3, "failed edac_device_add_device()\n");
                 goto err;
         }
 
@@ -363,7 +363,7 @@ static int __devinit mv64x60_sram_err_probe(struct platform_device *pdev)
         devres_remove_group(&pdev->dev, mv64x60_sram_err_probe);
 
         /* get this far and it's successful */
-        debugf3("%s(): success\n", __func__);
+        edac_dbg(3, "success\n");
 
         return 0;
 
@@ -379,7 +379,7 @@ static int mv64x60_sram_err_remove(struct platform_device *pdev)
 {
         struct edac_device_ctl_info *edac_dev = platform_get_drvdata(pdev);
 
-        debugf0("%s()\n", __func__);
+        edac_dbg(0, "\n");
 
         edac_device_del_device(&pdev->dev);
         edac_device_free_ctl_info(edac_dev);
@@ -531,7 +531,7 @@ static int __devinit mv64x60_cpu_err_probe(struct platform_device *pdev)
         pdata->edac_idx = edac_dev_idx++;
 
         if (edac_device_add_device(edac_dev) > 0) {
-                debugf3("%s(): failed edac_device_add_device()\n", __func__);
+                edac_dbg(3, "failed edac_device_add_device()\n");
                 goto err;
         }
 
@@ -558,7 +558,7 @@ static int __devinit mv64x60_cpu_err_probe(struct platform_device *pdev)
         devres_remove_group(&pdev->dev, mv64x60_cpu_err_probe);
 
         /* get this far and it's successful */
-        debugf3("%s(): success\n", __func__);
+        edac_dbg(3, "success\n");
 
         return 0;
 
@@ -574,7 +574,7 @@ static int mv64x60_cpu_err_remove(struct platform_device *pdev)
 {
         struct edac_device_ctl_info *edac_dev = platform_get_drvdata(pdev);
 
-        debugf0("%s()\n", __func__);
+        edac_dbg(0, "\n");
 
         edac_device_del_device(&pdev->dev);
         edac_device_free_ctl_info(edac_dev);
@@ -611,17 +611,17 @@ static void mv64x60_mc_check(struct mem_ctl_info *mci)
 
         /* first bit clear in ECC Err Reg, 1 bit error, correctable by HW */
         if (!(reg & 0x1))
-                edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,
+                edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
                                      err_addr >> PAGE_SHIFT,
                                      err_addr & PAGE_MASK, syndrome,
                                      0, 0, -1,
-                                     mci->ctl_name, "", NULL);
+                                     mci->ctl_name, "");
         else    /* 2 bit error, UE */
-                edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci,
+                edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
                                      err_addr >> PAGE_SHIFT,
                                      err_addr & PAGE_MASK, 0,
                                      0, 0, -1,
-                                     mci->ctl_name, "", NULL);
+                                     mci->ctl_name, "");
 
         /* clear the error */
         out_le32(pdata->mc_vbase + MV64X60_SDRAM_ERR_ADDR, 0);
@@ -670,8 +670,8 @@ static void mv64x60_init_csrows(struct mem_ctl_info *mci,
 
         ctl = in_le32(pdata->mc_vbase + MV64X60_SDRAM_CONFIG);
 
-        csrow = &mci->csrows[0];
-        dimm = csrow->channels[0].dimm;
+        csrow = mci->csrows[0];
+        dimm = csrow->channels[0]->dimm;
 
         dimm->nr_pages = pdata->total_mem >> PAGE_SHIFT;
         dimm->grain = 8;
@@ -724,7 +724,7 @@ static int __devinit mv64x60_mc_err_probe(struct platform_device *pdev)
         }
 
         pdata = mci->pvt_info;
-        mci->dev = &pdev->dev;
+        mci->pdev = &pdev->dev;
         platform_set_drvdata(pdev, mci);
         pdata->name = "mv64x60_mc_err";
         pdata->irq = NO_IRQ;
@@ -766,7 +766,7 @@ static int __devinit mv64x60_mc_err_probe(struct platform_device *pdev)
                 goto err2;
         }
 
-        debugf3("%s(): init mci\n", __func__);
+        edac_dbg(3, "init mci\n");
         mci->mtype_cap = MEM_FLAG_RDDR | MEM_FLAG_DDR;
         mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;
         mci->edac_cap = EDAC_FLAG_SECDED;
@@ -790,7 +790,7 @@ static int __devinit mv64x60_mc_err_probe(struct platform_device *pdev)
         out_le32(pdata->mc_vbase + MV64X60_SDRAM_ERR_ECC_CNTL, ctl);
 
         if (edac_mc_add_mc(mci)) {
-                debugf3("%s(): failed edac_mc_add_mc()\n", __func__);
+                edac_dbg(3, "failed edac_mc_add_mc()\n");
                 goto err;
         }
 
@@ -815,7 +815,7 @@ static int __devinit mv64x60_mc_err_probe(struct platform_device *pdev)
         }
 
         /* get this far and it's successful */
-        debugf3("%s(): success\n", __func__);
+        edac_dbg(3, "success\n");
 
         return 0;
 
@@ -831,7 +831,7 @@ static int mv64x60_mc_err_remove(struct platform_device *pdev)
 {
         struct mem_ctl_info *mci = platform_get_drvdata(pdev);
 
-        debugf0("%s()\n", __func__);
+        edac_dbg(0, "\n");
 
         edac_mc_del_mc(&pdev->dev);
         edac_mc_free(mci);