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, 17 insertions, 18 deletions

diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c
index 691d7067a141..3ce661e883f7 100644
--- a/drivers/edac/e7xxx_edac.c
+++ b/drivers/edac/e7xxx_edac.c
@@ -166,7 +166,7 @@ static const struct e7xxx_dev_info e7xxx_devs[] = {
 /* FIXME - is this valid for both SECDED and S4ECD4ED? */
 static inline int e7xxx_find_channel(u16 syndrome)
 {
-        debugf3("\n");
+        edac_dbg(3, "\n");
 
         if ((syndrome & 0xff00) == 0)
                 return 0;
@@ -186,7 +186,7 @@ static unsigned long ctl_page_to_phys(struct mem_ctl_info *mci,
         u32 remap;
         struct e7xxx_pvt *pvt = (struct e7xxx_pvt *)mci->pvt_info;
 
-        debugf3("\n");
+        edac_dbg(3, "\n");
 
         if ((page < pvt->tolm) ||
                 ((page >= 0x100000) && (page < pvt->remapbase)))
@@ -208,7 +208,7 @@ static void process_ce(struct mem_ctl_info *mci, struct e7xxx_error_info *info)
         int row;
         int channel;
 
-        debugf3("\n");
+        edac_dbg(3, "\n");
         /* read the error address */
         error_1b = info->dram_celog_add;
         /* FIXME - should use PAGE_SHIFT */
@@ -225,7 +225,7 @@ static void process_ce(struct mem_ctl_info *mci, struct e7xxx_error_info *info)
 
 static void process_ce_no_info(struct mem_ctl_info *mci)
 {
-        debugf3("\n");
+        edac_dbg(3, "\n");
         edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0, -1, -1, -1,
                              "e7xxx CE log register overflow", "", NULL);
 }
@@ -235,7 +235,7 @@ static void process_ue(struct mem_ctl_info *mci, struct e7xxx_error_info *info)
         u32 error_2b, block_page;
         int row;
 
-        debugf3("\n");
+        edac_dbg(3, "\n");
         /* read the error address */
         error_2b = info->dram_uelog_add;
         /* FIXME - should use PAGE_SHIFT */
@@ -248,7 +248,7 @@ static void process_ue(struct mem_ctl_info *mci, struct e7xxx_error_info *info)
 
 static void process_ue_no_info(struct mem_ctl_info *mci)
 {
-        debugf3("\n");
+        edac_dbg(3, "\n");
 
         edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0, -1, -1, -1,
                              "e7xxx UE log register overflow", "", NULL);
@@ -334,7 +334,7 @@ static void e7xxx_check(struct mem_ctl_info *mci)
 {
         struct e7xxx_error_info info;
 
-        debugf3("\n");
+        edac_dbg(3, "\n");
         e7xxx_get_error_info(mci, &info);
         e7xxx_process_error_info(mci, &info, 1);
 }
@@ -383,8 +383,7 @@ static void e7xxx_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev,
                 pci_read_config_byte(pdev, E7XXX_DRB + index, &value);
                 /* convert a 64 or 32 MiB DRB to a page size. */
                 cumul_size = value << (25 + drc_drbg - PAGE_SHIFT);
-                debugf3("(%d) cumul_size 0x%x\n", index,
-                        cumul_size);
+                edac_dbg(3, "(%d) cumul_size 0x%x\n", index, cumul_size);
                 if (cumul_size == last_cumul_size)
                         continue;       /* not populated */
 
@@ -430,7 +429,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
         int drc_chan;
         struct e7xxx_error_info discard;
 
-        debugf0("mci\n");
+        edac_dbg(0, "mci\n");
 
         pci_read_config_dword(pdev, E7XXX_DRC, &drc);
 
@@ -453,7 +452,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
         if (mci == NULL)
                 return -ENOMEM;
 
-        debugf3("init mci\n");
+        edac_dbg(3, "init mci\n");
         mci->mtype_cap = MEM_FLAG_RDDR;
         mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED |
                 EDAC_FLAG_S4ECD4ED;
@@ -461,7 +460,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
         mci->mod_name = EDAC_MOD_STR;
         mci->mod_ver = E7XXX_REVISION;
         mci->pdev = &pdev->dev;
-        debugf3("init pvt\n");
+        edac_dbg(3, "init pvt\n");
         pvt = (struct e7xxx_pvt *)mci->pvt_info;
         pvt->dev_info = &e7xxx_devs[dev_idx];
         pvt->bridge_ck = pci_get_device(PCI_VENDOR_ID_INTEL,
@@ -474,14 +473,14 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
                 goto fail0;
         }
 
-        debugf3("more mci init\n");
+        edac_dbg(3, "more mci init\n");
         mci->ctl_name = pvt->dev_info->ctl_name;
         mci->dev_name = pci_name(pdev);
         mci->edac_check = e7xxx_check;
         mci->ctl_page_to_phys = ctl_page_to_phys;
         e7xxx_init_csrows(mci, pdev, dev_idx, drc);
         mci->edac_cap |= EDAC_FLAG_NONE;
-        debugf3("tolm, remapbase, remaplimit\n");
+        edac_dbg(3, "tolm, remapbase, remaplimit\n");
         /* load the top of low memory, remap base, and remap limit vars */
         pci_read_config_word(pdev, E7XXX_TOLM, &pci_data);
         pvt->tolm = ((u32) pci_data) << 4;
@@ -500,7 +499,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
          * type of memory controller.  The ID is therefore hardcoded to 0.
          */
         if (edac_mc_add_mc(mci)) {
-                debugf3("failed edac_mc_add_mc()\n");
+                edac_dbg(3, "failed edac_mc_add_mc()\n");
                 goto fail1;
         }
 
@@ -516,7 +515,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
         }
 
         /* get this far and it's successful */
-        debugf3("success\n");
+        edac_dbg(3, "success\n");
         return 0;
 
 fail1:
@@ -532,7 +531,7 @@ fail0:
 static int __devinit e7xxx_init_one(struct pci_dev *pdev,
                                 const struct pci_device_id *ent)
 {
-        debugf0("\n");
+        edac_dbg(0, "\n");
 
         /* wake up and enable device */
         return pci_enable_device(pdev) ?
@@ -544,7 +543,7 @@ static void __devexit e7xxx_remove_one(struct pci_dev *pdev)
         struct mem_ctl_info *mci;
         struct e7xxx_pvt *pvt;
 
-        debugf0("\n");
+        edac_dbg(0, "\n");
 
         if (e7xxx_pci)
                 edac_pci_release_generic_ctl(e7xxx_pci);