hw/timer/arm_mptimer.c: Undo accidental rename of arm_mptimer_init()
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 22 Oct 2019 15:50:35 +0000 (16:50 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 22 Oct 2019 16:44:00 +0000 (17:44 +0100)
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

hw/timer/arm_mptimer.c

index fdf97d1800f180eb74e6ebb51ea8c142a191edc4..2bf11f788c37b191be3c5f4cb57bf57b3a768afe 100644 (file)
@@ -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,
 };