diff options
author | Peter Maydell | 2019-10-22 17:50:35 +0200 |
---|---|---|
committer | Peter Maydell | 2019-10-22 18:44:00 +0200 |
commit | a1f9a907eabcc0910e8dd06c5e87559fe97301b6 (patch) | |
tree | 47b910b2765941e3f86d9986247fa0679f12ae5d /hw/timer | |
parent | hw/timer/exynos4210_mct: Initialize ptimer before starting it (diff) | |
download | qemu-a1f9a907eabcc0910e8dd06c5e87559fe97301b6.tar.gz qemu-a1f9a907eabcc0910e8dd06c5e87559fe97301b6.tar.xz qemu-a1f9a907eabcc0910e8dd06c5e87559fe97301b6.zip |
hw/timer/arm_mptimer.c: Undo accidental rename of arm_mptimer_init()
In commit b01422622b we did an automated rename of the ptimer_init()
function to ptimer_init_with_bh(). Unfortunately this caught the
unrelated arm_mptimer_init() function. Undo that accidental
renaming.
Fixes: b01422622b7c7293196fdaf1dbb4f495af44ecf9
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20191017133331.5901-1-peter.maydell@linaro.org
Diffstat (limited to 'hw/timer')
-rw-r--r-- | hw/timer/arm_mptimer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index fdf97d1800..2bf11f788c 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -237,7 +237,7 @@ static void arm_mptimer_reset(DeviceState *dev) } } -static void arm_mptimer_init_with_bh(Object *obj) +static void arm_mptimer_init(Object *obj) { ARMMPTimerState *s = ARM_MPTIMER(obj); @@ -319,7 +319,7 @@ static const TypeInfo arm_mptimer_info = { .name = TYPE_ARM_MPTIMER, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(ARMMPTimerState), - .instance_init = arm_mptimer_init_with_bh, + .instance_init = arm_mptimer_init, .class_init = arm_mptimer_class_init, }; |