1 files changed, 24 insertions, 24 deletions

diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c
index bbe43ef71823..47180a08edad 100644
--- a/drivers/edac/i3200_edac.c
+++ b/drivers/edac/i3200_edac.c
@@ -110,10 +110,10 @@ static int how_many_channels(struct pci_dev *pdev)
 
         pci_read_config_byte(pdev, I3200_CAPID0 + 8, &capid0_8b);
         if (capid0_8b & 0x20) { /* check DCD: Dual Channel Disable */
-                debugf0("In single channel mode.\n");
+                edac_dbg(0, "In single channel mode\n");
                 return 1;
         } else {
-                debugf0("In dual channel mode.\n");
+                edac_dbg(0, "In dual channel mode\n");
                 return 2;
         }
 }
@@ -159,7 +159,7 @@ static void i3200_clear_error_info(struct mem_ctl_info *mci)
 {
         struct pci_dev *pdev;
 
-        pdev = to_pci_dev(mci->dev);
+        pdev = to_pci_dev(mci->pdev);
 
         /*
          * Clear any error bits.
@@ -176,7 +176,7 @@ static void i3200_get_and_clear_error_info(struct mem_ctl_info *mci,
         struct i3200_priv *priv = mci->pvt_info;
         void __iomem *window = priv->window;
 
-        pdev = to_pci_dev(mci->dev);
+        pdev = to_pci_dev(mci->pdev);
 
         /*
          * This is a mess because there is no atomic way to read all the
@@ -218,25 +218,25 @@ static void i3200_process_error_info(struct mem_ctl_info *mci,
                 return;
 
         if ((info->errsts ^ info->errsts2) & I3200_ERRSTS_BITS) {
-                edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0,
-                                     -1, -1, -1, "UE overwrote CE", "", NULL);
+                edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, 0, 0, 0,
+                                     -1, -1, -1, "UE overwrote CE", "");
                 info->errsts = info->errsts2;
         }
 
         for (channel = 0; channel < nr_channels; channel++) {
                 log = info->eccerrlog[channel];
                 if (log & I3200_ECCERRLOG_UE) {
-                        edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci,
+                        edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
                                              0, 0, 0,
                                              eccerrlog_row(channel, log),
                                              -1, -1,
-                                             "i3000 UE", "", NULL);
+                                             "i3000 UE", "");
                 } else if (log & I3200_ECCERRLOG_CE) {
-                        edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci,
+                        edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
                                              0, 0, eccerrlog_syndrome(log),
                                              eccerrlog_row(channel, log),
                                              -1, -1,
-                                             "i3000 UE", "", NULL);
+                                             "i3000 UE", "");
                 }
         }
 }
@@ -245,7 +245,7 @@ static void i3200_check(struct mem_ctl_info *mci)
 {
         struct i3200_error_info info;
 
-        debugf1("MC%d: %s()\n", mci->mc_idx, __func__);
+        edac_dbg(1, "MC%d\n", mci->mc_idx);
         i3200_get_and_clear_error_info(mci, &info);
         i3200_process_error_info(mci, &info);
 }
@@ -332,7 +332,7 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx)
         void __iomem *window;
         struct i3200_priv *priv;
 
-        debugf0("MC: %s()\n", __func__);
+        edac_dbg(0, "MC:\n");
 
         window = i3200_map_mchbar(pdev);
         if (!window)
@@ -352,9 +352,9 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx)
         if (!mci)
                 return -ENOMEM;
 
-        debugf3("MC: %s(): init mci\n", __func__);
+        edac_dbg(3, "MC: init mci\n");
 
-        mci->dev = &pdev->dev;
+        mci->pdev = &pdev->dev;
         mci->mtype_cap = MEM_FLAG_DDR2;
 
         mci->edac_ctl_cap = EDAC_FLAG_SECDED;
@@ -379,7 +379,7 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx)
          */
         for (i = 0; i < mci->nr_csrows; i++) {
                 unsigned long nr_pages;
-                struct csrow_info *csrow = &mci->csrows[i];
+                struct csrow_info *csrow = mci->csrows[i];
 
                 nr_pages = drb_to_nr_pages(drbs, stacked,
                         i / I3200_RANKS_PER_CHANNEL,
@@ -389,7 +389,7 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx)
                         continue;
 
                 for (j = 0; j < nr_channels; j++) {
-                        struct dimm_info *dimm = csrow->channels[j].dimm;
+                        struct dimm_info *dimm = csrow->channels[j]->dimm;
 
                         dimm->nr_pages = nr_pages / nr_channels;
                         dimm->grain = nr_pages << PAGE_SHIFT;
@@ -403,12 +403,12 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx)
 
         rc = -ENODEV;
         if (edac_mc_add_mc(mci)) {
-                debugf3("MC: %s(): failed edac_mc_add_mc()\n", __func__);
+                edac_dbg(3, "MC: failed edac_mc_add_mc()\n");
                 goto fail;
         }
 
         /* get this far and it's successful */
-        debugf3("MC: %s(): success\n", __func__);
+        edac_dbg(3, "MC: success\n");
         return 0;
 
 fail:
@@ -424,7 +424,7 @@ static int __devinit i3200_init_one(struct pci_dev *pdev,
 {
         int rc;
 
-        debugf0("MC: %s()\n", __func__);
+        edac_dbg(0, "MC:\n");
 
         if (pci_enable_device(pdev) < 0)
                 return -EIO;
@@ -441,7 +441,7 @@ static void __devexit i3200_remove_one(struct pci_dev *pdev)
         struct mem_ctl_info *mci;
         struct i3200_priv *priv;
 
-        debugf0("%s()\n", __func__);
+        edac_dbg(0, "\n");
 
         mci = edac_mc_del_mc(&pdev->dev);
         if (!mci)
@@ -475,7 +475,7 @@ static int __init i3200_init(void)
 {
         int pci_rc;
 
-        debugf3("MC: %s()\n", __func__);
+        edac_dbg(3, "MC:\n");
 
         /* Ensure that the OPSTATE is set correctly for POLL or NMI */
         opstate_init();
@@ -489,14 +489,14 @@ static int __init i3200_init(void)
                 mci_pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
                                 PCI_DEVICE_ID_INTEL_3200_HB, NULL);
                 if (!mci_pdev) {
-                        debugf0("i3200 pci_get_device fail\n");
+                        edac_dbg(0, "i3200 pci_get_device fail\n");
                         pci_rc = -ENODEV;
                         goto fail1;
                 }
 
                 pci_rc = i3200_init_one(mci_pdev, i3200_pci_tbl);
                 if (pci_rc < 0) {
-                        debugf0("i3200 init fail\n");
+                        edac_dbg(0, "i3200 init fail\n");
                         pci_rc = -ENODEV;
                         goto fail1;
                 }
@@ -516,7 +516,7 @@ fail0:
 
 static void __exit i3200_exit(void)
 {
-        debugf3("MC: %s()\n", __func__);
+        edac_dbg(3, "MC:\n");
 
         pci_unregister_driver(&i3200_driver);
         if (!i3200_registered) {