edac: Convert debugfX to edac_dbg(X,

Use a more common debugging style.

Remove __FILE__ uses, add missing newlines,
coalesce formats and align arguments.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 14 insertions, 15 deletions

diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c
index 91b9e33fff27..974d1a2be379 100644
--- a/drivers/edac/i82975x_edac.c
+++ b/drivers/edac/i82975x_edac.c
@@ -331,7 +331,7 @@ static void i82975x_check(struct mem_ctl_info *mci)
 {
         struct i82975x_error_info info;
 
-        debugf1("MC%d\n", mci->mc_idx);
+        edac_dbg(1, "MC%d\n", mci->mc_idx);
         i82975x_get_error_info(mci, &info);
         i82975x_process_error_info(mci, &info, 1);
 }
@@ -406,8 +406,7 @@ static void i82975x_init_csrows(struct mem_ctl_info *mci,
                  */
                 if (csrow->nr_channels > 1)
                         cumul_size <<= 1;
-                debugf3("(%d) cumul_size 0x%x\n", index,
-                        cumul_size);
+                edac_dbg(3, "(%d) cumul_size 0x%x\n", index, cumul_size);
 
                 nr_pages = cumul_size - last_cumul_size;
                 if (!nr_pages)
@@ -489,11 +488,11 @@ static int i82975x_probe1(struct pci_dev *pdev, int dev_idx)
         u8 c1drb[4];
 #endif
 
-        debugf0("\n");
+        edac_dbg(0, "\n");
 
         pci_read_config_dword(pdev, I82975X_MCHBAR, &mchbar);
         if (!(mchbar & 1)) {
-                debugf3("failed, MCHBAR disabled!\n");
+                edac_dbg(3, "failed, MCHBAR disabled!\n");
                 goto fail0;
         }
         mchbar &= 0xffffc000;   /* bits 31:14 used for 16K window */
@@ -558,7 +557,7 @@ static int i82975x_probe1(struct pci_dev *pdev, int dev_idx)
                 goto fail1;
         }
 
-        debugf3("init mci\n");
+        edac_dbg(3, "init mci\n");
         mci->pdev = &pdev->dev;
         mci->mtype_cap = MEM_FLAG_DDR2;
         mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;
@@ -569,7 +568,7 @@ static int i82975x_probe1(struct pci_dev *pdev, int dev_idx)
         mci->dev_name = pci_name(pdev);
         mci->edac_check = i82975x_check;
         mci->ctl_page_to_phys = NULL;
-        debugf3("init pvt\n");
+        edac_dbg(3, "init pvt\n");
         pvt = (struct i82975x_pvt *) mci->pvt_info;
         pvt->mch_window = mch_window;
         i82975x_init_csrows(mci, pdev, mch_window);
@@ -578,12 +577,12 @@ static int i82975x_probe1(struct pci_dev *pdev, int dev_idx)
 
         /* finalize this instance of memory controller with edac core */
         if (edac_mc_add_mc(mci)) {
-                debugf3("failed edac_mc_add_mc()\n");
+                edac_dbg(3, "failed edac_mc_add_mc()\n");
                 goto fail2;
         }
 
         /* get this far and it's successful */
-        debugf3("success\n");
+        edac_dbg(3, "success\n");
         return 0;
 
 fail2:
@@ -601,7 +600,7 @@ static int __devinit i82975x_init_one(struct pci_dev *pdev,
 {
         int rc;
 
-        debugf0("\n");
+        edac_dbg(0, "\n");
 
         if (pci_enable_device(pdev) < 0)
                 return -EIO;
@@ -619,7 +618,7 @@ static void __devexit i82975x_remove_one(struct pci_dev *pdev)
         struct mem_ctl_info *mci;
         struct i82975x_pvt *pvt;
 
-        debugf0("\n");
+        edac_dbg(0, "\n");
 
         mci = edac_mc_del_mc(&pdev->dev);
         if (mci  == NULL)
@@ -655,7 +654,7 @@ static int __init i82975x_init(void)
 {
         int pci_rc;
 
-        debugf3("\n");
+        edac_dbg(3, "\n");
 
        /* Ensure that the OPSTATE is set correctly for POLL or NMI */
        opstate_init();
@@ -669,7 +668,7 @@ static int __init i82975x_init(void)
                                 PCI_DEVICE_ID_INTEL_82975_0, NULL);
 
                 if (!mci_pdev) {
-                        debugf0("i82975x pci_get_device fail\n");
+                        edac_dbg(0, "i82975x pci_get_device fail\n");
                         pci_rc = -ENODEV;
                         goto fail1;
                 }
@@ -677,7 +676,7 @@ static int __init i82975x_init(void)
                 pci_rc = i82975x_init_one(mci_pdev, i82975x_pci_tbl);
 
                 if (pci_rc < 0) {
-                        debugf0("i82975x init fail\n");
+                        edac_dbg(0, "i82975x init fail\n");
                         pci_rc = -ENODEV;
                         goto fail1;
                 }
@@ -697,7 +696,7 @@ fail0:
 
 static void __exit i82975x_exit(void)
 {
-        debugf3("\n");
+        edac_dbg(3, "\n");
 
         pci_unregister_driver(&i82975x_driver);