1 files changed, 11 insertions, 13 deletions

diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c
index 0570cf3d2563..be1880de33a6 100644
--- a/drivers/edac/i5400_edac.c
+++ b/drivers/edac/i5400_edac.c
@@ -700,7 +700,7 @@ static void i5400_clear_error(struct mem_ctl_info *mci)
 static void i5400_check_error(struct mem_ctl_info *mci)
 {
         struct i5400_error_info info;
-        debugf4("MC%d: %s: %s()\n", mci->mc_idx, __FILE__, __func__);
+        debugf4("MC%d\n", mci->mc_idx);
         i5400_get_error_info(mci, &info);
         i5400_process_error_info(mci, &info);
 }
@@ -1203,8 +1203,7 @@ static int i5400_init_dimms(struct mem_ctl_info *mci)
 
                         size_mb =  pvt->dimm_info[slot][channel].megabytes;
 
-                        debugf2("%s: dimm (branch %d channel %d slot %d): %d.%03d GB\n",
-                                __func__,
+                        debugf2("dimm (branch %d channel %d slot %d): %d.%03d GB\n",
                                 channel / 2, channel % 2, slot,
                                 size_mb / 1000, size_mb % 1000);
 
@@ -1270,9 +1269,8 @@ static int i5400_probe1(struct pci_dev *pdev, int dev_idx)
         if (dev_idx >= ARRAY_SIZE(i5400_devs))
                 return -EINVAL;
 
-        debugf0("MC: %s: %s(), pdev bus %u dev=0x%x fn=0x%x\n",
-                __FILE__, __func__,
-                pdev->bus->number,
+        debugf0("MC: %s(), pdev bus %u dev=0x%x fn=0x%x\n",
+                __FILE__, pdev->bus->number,
                 PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn));
 
         /* We only are looking for func 0 of the set */
@@ -1297,7 +1295,7 @@ static int i5400_probe1(struct pci_dev *pdev, int dev_idx)
         if (mci == NULL)
                 return -ENOMEM;
 
-        debugf0("MC: %s: %s(): mci = %p\n", __FILE__, __func__, mci);
+        debugf0("MC: %s(): mci = %p\n", __FILE__, mci);
 
         mci->pdev = &pdev->dev; /* record ptr  to the generic device */
 
@@ -1340,8 +1338,8 @@ static int i5400_probe1(struct pci_dev *pdev, int dev_idx)
 
         /* add this new MC control structure to EDAC's list of MCs */
         if (edac_mc_add_mc(mci)) {
-                debugf0("MC: %s: %s(): failed edac_mc_add_mc()\n",
-                        __FILE__, __func__);
+                debugf0("MC: %s(): failed edac_mc_add_mc()\n",
+                        __FILE__);
                 /* FIXME: perhaps some code should go here that disables error
                  * reporting if we just enabled it
                  */
@@ -1385,7 +1383,7 @@ static int __devinit i5400_init_one(struct pci_dev *pdev,
 {
         int rc;
 
-        debugf0("MC: %s: %s()\n", __FILE__, __func__);
+        debugf0("MC: %s()\n", __FILE__);
 
         /* wake up device */
         rc = pci_enable_device(pdev);
@@ -1404,7 +1402,7 @@ static void __devexit i5400_remove_one(struct pci_dev *pdev)
 {
         struct mem_ctl_info *mci;
 
-        debugf0("%s: %s()\n", __FILE__, __func__);
+        debugf0("%s()\n", __FILE__);
 
         if (i5400_pci)
                 edac_pci_release_generic_ctl(i5400_pci);
@@ -1450,7 +1448,7 @@ static int __init i5400_init(void)
 {
         int pci_rc;
 
-        debugf2("MC: %s: %s()\n", __FILE__, __func__);
+        debugf2("MC: %s()\n", __FILE__);
 
         /* Ensure that the OPSTATE is set correctly for POLL or NMI */
         opstate_init();
@@ -1466,7 +1464,7 @@ static int __init i5400_init(void)
  */
 static void __exit i5400_exit(void)
 {
-        debugf2("MC: %s: %s()\n", __FILE__, __func__);
+        debugf2("MC: %s()\n", __FILE__);
         pci_unregister_driver(&i5400_driver);
 }