edac: Don't add __func__ or __FILE__ for debugf[0-9] msgs

The debug macro already adds that. Most of the work here was
made by this small script:

$f .=$_ while (<>);

$f =~ s/(debugf[0-9]\s*\(\s*)__FILE__\s*": /\1"/g;
$f =~ s/(debugf[0-9]\s*\(\s*)__FILE__\s*/\1/g;
$f =~ s/(debugf[0-9]\s*\(\s*)__FILE__\s*"MC: /\1"/g;

$f =~ s/(debugf[0-9]\s*\(\")\%s[\:\,\(\)]*\s*([^\"]*\s*[^\)]+)__func__\s*\,\s*/\1\2/g;
$f =~ s/(debugf[0-9]\s*\(\")\%s[\:\,\(\)]*\s*([^\"]*\s*[^\)]+),\s*__func__\s*\)/\1\2)/g;
$f =~ s/(debugf[0-9]\s*\(\"MC\:\s*)\%s[\:\,\(\)]*\s*([^\"]*\s*[^\)]+)__func__\s*\,\s*/\1\2/g;
$f =~ s/(debugf[0-9]\s*\(\"MC\:\s*)\%s[\:\,\(\)]*\s*([^\"]*\s*[^\)]+),\s*__func__\s*\)/\1\2)/g;

$f =~ s/\"MC\: \\n\"/"MC:\\n"/g;

print $f;

After running the script, manual cleanups were done to fix it the remaining
places.

While here, removed the __LINE__ on most places, as it doesn't actually give
useful info on most places.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 11 insertions, 11 deletions

diff --git a/drivers/edac/i3000_edac.c b/drivers/edac/i3000_edac.c
index 812213da7f91..67975ba252fa 100644
--- a/drivers/edac/i3000_edac.c
+++ b/drivers/edac/i3000_edac.c
@@ -275,7 +275,7 @@ static void i3000_check(struct mem_ctl_info *mci)
 {
         struct i3000_error_info info;
 
-        debugf1("MC%d: %s()\n", mci->mc_idx, __func__);
+        debugf1("MC%d\n", mci->mc_idx);
         i3000_get_error_info(mci, &info);
         i3000_process_error_info(mci, &info, 1);
 }
@@ -322,7 +322,7 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx)
         unsigned long mchbar;
         void __iomem *window;
 
-        debugf0("MC: %s()\n", __func__);
+        debugf0("MC:\n");
 
         pci_read_config_dword(pdev, I3000_MCHBAR, (u32 *) & mchbar);
         mchbar &= I3000_MCHBAR_MASK;
@@ -366,7 +366,7 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx)
         if (!mci)
                 return -ENOMEM;
 
-        debugf3("MC: %s(): init mci\n", __func__);
+        debugf3("MC: init mci\n");
 
         mci->pdev = &pdev->dev;
         mci->mtype_cap = MEM_FLAG_DDR2;
@@ -399,8 +399,8 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx)
                 cumul_size = value << (I3000_DRB_SHIFT - PAGE_SHIFT);
                 if (interleaved)
                         cumul_size <<= 1;
-                debugf3("MC: %s(): (%d) cumul_size 0x%x\n",
-                        __func__, i, cumul_size);
+                debugf3("MC: (%d) cumul_size 0x%x\n",
+                        i, cumul_size);
                 if (cumul_size == last_cumul_size)
                         continue;
 
@@ -429,7 +429,7 @@ static int i3000_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__);
+                debugf3("MC: failed edac_mc_add_mc()\n");
                 goto fail;
         }
 
@@ -445,7 +445,7 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx)
         }
 
         /* get this far and it's successful */
-        debugf3("MC: %s(): success\n", __func__);
+        debugf3("MC: success\n");
         return 0;
 
 fail:
@@ -461,7 +461,7 @@ static int __devinit i3000_init_one(struct pci_dev *pdev,
 {
         int rc;
 
-        debugf0("MC: %s()\n", __func__);
+        debugf0("MC:\n");
 
         if (pci_enable_device(pdev) < 0)
                 return -EIO;
@@ -477,7 +477,7 @@ static void __devexit i3000_remove_one(struct pci_dev *pdev)
 {
         struct mem_ctl_info *mci;
 
-        debugf0("%s()\n", __func__);
+        debugf0("\n");
 
         if (i3000_pci)
                 edac_pci_release_generic_ctl(i3000_pci);
@@ -511,7 +511,7 @@ static int __init i3000_init(void)
 {
         int pci_rc;
 
-        debugf3("MC: %s()\n", __func__);
+        debugf3("MC:\n");
 
        /* Ensure that the OPSTATE is set correctly for POLL or NMI */
        opstate_init();
@@ -552,7 +552,7 @@ fail0:
 
 static void __exit i3000_exit(void)
 {
-        debugf3("MC: %s()\n", __func__);
+        debugf3("MC:\n");
 
         pci_unregister_driver(&i3000_driver);
         if (!i3000_registered) {