commit 4abc7ebf5f00bb53439e2923cd47f7642491abf8
author Peter Chubb <peter.chubb@nicta.com.au> Tue Nov 22 04:20:23 2011 +0100
committer Andrzej Zaborowski <balrog@zabor.org> Mon Dec 05 21:38:41 2011 +0100
tree 29d009570e5165ff057cff3eae0073bb41fafdfb
parent eb5d5beaebd102599a915f6c4813d445ddc9dc84

Fix hw_error messages from arm_timer.c

Two of the calls to hw_error() in arm_timer.c contain the wrong function name.

As suggested by Andreas Färber, use the C99 standard __func__ macro to
get the correct name, instead of putting the name directly into the code.

Signed-off-by: Peter Chubb <peter.chubb@nicta.com.au>
Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>

hw/arm_timer.c

diff --git a/hw/arm_timer.c b/hw/arm_timer.c
index 8f442d7..518bad2 100644
--- a/hw/arm_timer.c
+++ b/hw/arm_timer.c
@@ -61,7 +61,7 @@
             return 0;
         return s->int_level;
     default:
-        hw_error("arm_timer_read: Bad offset %x\n", (int)offset);
+        hw_error("%s: Bad offset %x\n", __func__, (int)offset);
         return 0;
     }
 }
@@ -128,7 +128,7 @@
         arm_timer_recalibrate(s, 0);
         break;
     default:
-        hw_error("arm_timer_write: Bad offset %x\n", (int)offset);
+        hw_error("%s: Bad offset %x\n", __func__, (int)offset);
     }
     arm_timer_update(s);
 }
@@ -270,7 +270,7 @@
     /* ??? Don't know the PrimeCell ID for this device.  */
     n = offset >> 8;
     if (n > 2) {
-        hw_error("sp804_read: Bad timer %d\n", n);
+        hw_error("%s: Bad timer %d\n", __func__, n);
     }
 
     return arm_timer_read(s->timer[n], offset & 0xff);
@@ -284,7 +284,7 @@
 
     n = offset >> 8;
     if (n > 2) {
-        hw_error("sp804_write: Bad timer %d\n", n);
+        hw_error("%s: Bad timer %d\n", __func__, n);
     }
 
     arm_timer_write(s->timer[n], offset & 0xff, value);