summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPeter Chubb <peter.chubb@nicta.com.au>2011-11-22 04:20:23 +0100
committerAndrzej Zaborowski <balrog@zabor.org>2011-12-05 21:38:41 +0100
commit4abc7ebf5f00bb53439e2923cd47f7642491abf8 (patch)
tree29d009570e5165ff057cff3eae0073bb41fafdfb
parenteb5d5beaebd102599a915f6c4813d445ddc9dc84 (diff)
downloadfocaccia-qemu-4abc7ebf5f00bb53439e2923cd47f7642491abf8.tar.gz
focaccia-qemu-4abc7ebf5f00bb53439e2923cd47f7642491abf8.zip
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>
-rw-r--r--hw/arm_timer.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/arm_timer.c b/hw/arm_timer.c
index 8f442d7878..518bad20ae 100644
--- a/hw/arm_timer.c
+++ b/hw/arm_timer.c
@@ -61,7 +61,7 @@ static uint32_t arm_timer_read(void *opaque, target_phys_addr_t offset)
             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 @@ static void arm_timer_write(void *opaque, target_phys_addr_t offset,
         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 @@ static uint64_t icp_pit_read(void *opaque, target_phys_addr_t offset,
     /* ??? 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 @@ static void icp_pit_write(void *opaque, target_phys_addr_t offset,
 
     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);