hw/timer/arm_mptimer.c: Undo accidental rename of arm_mptimer_init()

[PATCH] hw/timer/arm_mptimer.c: Undo accidental rename of arm_mptimer_init()

Peter Maydell posted 1 patch 6 years ago

Download mbox

Test FreeBSD passed

Test asan passed

Test checkpatch passed

Test docker-clang@ubuntu passed

Test docker-mingw@fedora passed

Test docker-quick@centos7 passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20191017133331.5901-1-peter.maydell@linaro.org

Maintainers: Peter Maydell <peter.maydell@linaro.org>

hw/timer/arm_mptimer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Expand all Fold all

[PATCH] hw/timer/arm_mptimer.c: Undo accidental rename of arm_mptimer_init()

Posted by Peter Maydell 6 years ago

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>
---
 hw/timer/arm_mptimer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c
index fdf97d1800f..2bf11f788c3 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,
 };
 
-- 
2.20.1

Re: [PATCH] hw/timer/arm_mptimer.c: Undo accidental rename of arm_mptimer_init()

Posted by Philippe Mathieu-Daudé 6 years ago

On 10/17/19 3:33 PM, Peter Maydell wrote:
> 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: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
>   hw/timer/arm_mptimer.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c
> index fdf97d1800f..2bf11f788c3 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,
>   };
>   
>

Re: [PATCH] hw/timer/arm_mptimer.c: Undo accidental rename of arm_mptimer_init()

Posted by Richard Henderson 6 years ago

On 10/17/19 6:33 AM, Peter Maydell wrote:
> 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>
> ---
>  hw/timer/arm_mptimer.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~