1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c
index f99d10655ed4..010c1d6526f5 100644
--- a/drivers/edac/i5400_edac.c
+++ b/drivers/edac/i5400_edac.c
@@ -694,7 +694,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: " __FILE__ ": %s()\n", mci->mc_idx, __func__);
+        debugf4("MC%d: %s: %s()\n", mci->mc_idx, __FILE__, __func__);
         i5400_get_error_info(mci, &info);
         i5400_process_error_info(mci, &info);
 }
@@ -1227,8 +1227,8 @@ static int i5400_probe1(struct pci_dev *pdev, int dev_idx)
         if (dev_idx >= ARRAY_SIZE(i5400_devs))
                 return -EINVAL;
 
-        debugf0("MC: " __FILE__ ": %s(), pdev bus %u dev=0x%x fn=0x%x\n",
-                __func__,
+        debugf0("MC: %s: %s(), pdev bus %u dev=0x%x fn=0x%x\n",
+                __FILE__, __func__,
                 pdev->bus->number,
                 PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn));
 
@@ -1256,7 +1256,7 @@ static int i5400_probe1(struct pci_dev *pdev, int dev_idx)
         if (mci == NULL)
                 return -ENOMEM;
 
-        debugf0("MC: " __FILE__ ": %s(): mci = %p\n", __func__, mci);
+        debugf0("MC: %s: %s(): mci = %p\n", __FILE__, __func__, mci);
 
         mci->dev = &pdev->dev;  /* record ptr  to the generic device */
 
@@ -1299,8 +1299,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: " __FILE__
-                        ": %s(): failed edac_mc_add_mc()\n", __func__);
+                debugf0("MC: %s: %s(): failed edac_mc_add_mc()\n",
+                        __FILE__, __func__);
                 /* FIXME: perhaps some code should go here that disables error
                  * reporting if we just enabled it
                  */
@@ -1344,7 +1344,7 @@ static int __devinit i5400_init_one(struct pci_dev *pdev,
 {
         int rc;
 
-        debugf0("MC: " __FILE__ ": %s()\n", __func__);
+        debugf0("MC: %s: %s()\n", __FILE__, __func__);
 
         /* wake up device */
         rc = pci_enable_device(pdev);
@@ -1363,7 +1363,7 @@ static void __devexit i5400_remove_one(struct pci_dev *pdev)
 {
         struct mem_ctl_info *mci;
 
-        debugf0(__FILE__ ": %s()\n", __func__);
+        debugf0("%s: %s()\n", __FILE__, __func__);
 
         if (i5400_pci)
                 edac_pci_release_generic_ctl(i5400_pci);
@@ -1409,7 +1409,7 @@ static int __init i5400_init(void)
 {
         int pci_rc;
 
-        debugf2("MC: " __FILE__ ": %s()\n", __func__);
+        debugf2("MC: %s: %s()\n", __FILE__, __func__);
 
         /* Ensure that the OPSTATE is set correctly for POLL or NMI */
         opstate_init();
@@ -1425,7 +1425,7 @@ static int __init i5400_init(void)
  */
 static void __exit i5400_exit(void)
 {
-        debugf2("MC: " __FILE__ ": %s()\n", __func__);
+        debugf2("MC: %s: %s()\n", __FILE__, __func__);
         pci_unregister_driver(&i5400_driver);
 }