qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>,
	qemu-arm@nongnu.org, qemu-devel@nongnu.org
Subject: Re: [PATCH] hw/timer/arm_mptimer.c: Undo accidental rename of arm_mptimer_init()
Date: Thu, 17 Oct 2019 16:33:31 +0200	[thread overview]
Message-ID: <b9263235-7786-2e24-943c-32626f00dd75@redhat.com> (raw)
In-Reply-To: <20191017133331.5901-1-peter.maydell@linaro.org>

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,
>   };
>   
> 



      parent reply	other threads:[~2019-10-17 15:25 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-17 13:33 [PATCH] hw/timer/arm_mptimer.c: Undo accidental rename of arm_mptimer_init() Peter Maydell
2019-10-17 14:17 ` Richard Henderson
2019-10-17 14:33 ` Philippe Mathieu-Daudé [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b9263235-7786-2e24-943c-32626f00dd75@redhat.com \
    --to=philmd@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).