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, 9 insertions, 9 deletions

diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c
index 06a3c8d26d19..d4ec21db22ba 100644
--- a/drivers/edac/i82860_edac.c
+++ b/drivers/edac/i82860_edac.c
@@ -136,7 +136,7 @@ static void i82860_check(struct mem_ctl_info *mci)
 {
         struct i82860_error_info info;
 
-        debugf1("MC%d: %s()\n", mci->mc_idx, __func__);
+        debugf1("MC%d\n", mci->mc_idx);
         i82860_get_error_info(mci, &info);
         i82860_process_error_info(mci, &info, 1);
 }
@@ -167,7 +167,7 @@ static void i82860_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev)
                 pci_read_config_word(pdev, I82860_GBA + index * 2, &value);
                 cumul_size = (value & I82860_GBA_MASK) <<
                         (I82860_GBA_SHIFT - PAGE_SHIFT);
-                debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index,
+                debugf3("(%d) cumul_size 0x%x\n", index,
                         cumul_size);
 
                 if (cumul_size == last_cumul_size)
@@ -210,7 +210,7 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx)
         if (!mci)
                 return -ENOMEM;
 
-        debugf3("%s(): init mci\n", __func__);
+        debugf3("init mci\n");
         mci->pdev = &pdev->dev;
         mci->mtype_cap = MEM_FLAG_DDR;
         mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;
@@ -229,7 +229,7 @@ static int i82860_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("%s(): failed edac_mc_add_mc()\n", __func__);
+                debugf3("failed edac_mc_add_mc()\n");
                 goto fail;
         }
 
@@ -245,7 +245,7 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx)
         }
 
         /* get this far and it's successful */
-        debugf3("%s(): success\n", __func__);
+        debugf3("success\n");
 
         return 0;
 
@@ -260,7 +260,7 @@ static int __devinit i82860_init_one(struct pci_dev *pdev,
 {
         int rc;
 
-        debugf0("%s()\n", __func__);
+        debugf0("\n");
         i82860_printk(KERN_INFO, "i82860 init one\n");
 
         if (pci_enable_device(pdev) < 0)
@@ -278,7 +278,7 @@ static void __devexit i82860_remove_one(struct pci_dev *pdev)
 {
         struct mem_ctl_info *mci;
 
-        debugf0("%s()\n", __func__);
+        debugf0("\n");
 
         if (i82860_pci)
                 edac_pci_release_generic_ctl(i82860_pci);
@@ -311,7 +311,7 @@ static int __init i82860_init(void)
 {
         int pci_rc;
 
-        debugf3("%s()\n", __func__);
+        debugf3("\n");
 
        /* Ensure that the OPSTATE is set correctly for POLL or NMI */
        opstate_init();
@@ -352,7 +352,7 @@ fail0:
 
 static void __exit i82860_exit(void)
 {
-        debugf3("%s()\n", __func__);
+        debugf3("\n");
 
         pci_unregister_driver(&i82860_driver);