[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 10/19] hw/timer/arm_timer: Rename arm_timer_init() -> arm_time
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 10/19] hw/timer/arm_timer: Rename arm_timer_init() -> arm_timer_new() |
Date: |
Tue, 4 Jul 2023 16:50:03 +0200 |
QDev models often use foo_new() as the combination of
foo_init() + foo_realize(). Here arm_timer_init() is
a such combination, so rename it as arm_timer_new() to
emphasis the returned device is already realized.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/timer/arm_timer.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c
index cbd82e8365..4ef34b0f60 100644
--- a/hw/timer/arm_timer.c
+++ b/hw/timer/arm_timer.c
@@ -179,7 +179,7 @@ static void arm_timer_reset_hold(ArmTimer *s)
s->control = TIMER_CTRL_IE;
}
-static ArmTimer *arm_timer_init(uint32_t freq)
+static ArmTimer *arm_timer_new(uint32_t freq)
{
ArmTimer *s;
@@ -310,8 +310,8 @@ static void sp804_realize(DeviceState *dev, Error **errp)
{
SP804Timer *s = SP804_TIMER(dev);
- s->timer[0] = arm_timer_init(s->freq0);
- s->timer[1] = arm_timer_init(s->freq1);
+ s->timer[0] = arm_timer_new(s->freq0);
+ s->timer[1] = arm_timer_new(s->freq1);
s->timer[0]->irq = qemu_allocate_irq(sp804_set_irq, s, 0);
s->timer[1]->irq = qemu_allocate_irq(sp804_set_irq, s, 1);
}
@@ -386,10 +386,10 @@ static void icp_pit_init(Object *obj)
SysBusDevice *dev = SYS_BUS_DEVICE(obj);
/* Timer 0 runs at the system clock speed (40MHz). */
- s->timer[0] = arm_timer_init(40000000);
+ s->timer[0] = arm_timer_new(40000000);
/* The other two timers run at 1MHz. */
- s->timer[1] = arm_timer_init(1000000);
- s->timer[2] = arm_timer_init(1000000);
+ s->timer[1] = arm_timer_new(1000000);
+ s->timer[2] = arm_timer_new(1000000);
sysbus_init_irq(dev, &s->timer[0]->irq);
sysbus_init_irq(dev, &s->timer[1]->irq);
--
2.38.1
- [PATCH v2 05/19] hw/timer/arm_timer: CamelCase rename arm_timer_state -> ArmTimer, (continued)
- [PATCH v2 05/19] hw/timer/arm_timer: CamelCase rename arm_timer_state -> ArmTimer, Philippe Mathieu-Daudé, 2023/07/04
- [PATCH v2 07/19] hw/timer/arm_timer: Rename TYPE_SP804 -> TYPE_SP804_TIMER, Philippe Mathieu-Daudé, 2023/07/04
- [PATCH v2 09/19] hw/timer/arm_timer: Convert read/write handlers to MemoryRegionOps ones, Philippe Mathieu-Daudé, 2023/07/04
- [PATCH v2 08/19] hw/timer/arm_timer: Extract arm_timer_reset_hold(), Philippe Mathieu-Daudé, 2023/07/04
- [PATCH v2 13/19] hw/timer/arm_timer: Iterate on timers using for() loop statement, Philippe Mathieu-Daudé, 2023/07/04
- [PATCH v2 10/19] hw/timer/arm_timer: Rename arm_timer_init() -> arm_timer_new(),
Philippe Mathieu-Daudé <=
- [PATCH v2 11/19] hw/timer/arm_timer: Convert ArmTimer::freq to uint32_t type, Philippe Mathieu-Daudé, 2023/07/04
- [PATCH v2 14/19] hw/timer/arm_timer: Pass timer output IRQ as parameter to arm_timer_new, Philippe Mathieu-Daudé, 2023/07/04
- [PATCH v2 15/19] hw/timer/arm_timer: Fix misuse of SysBus IRQ in IntegratorPIT, Philippe Mathieu-Daudé, 2023/07/04
- [PATCH v2 12/19] hw/timer/arm_timer: Use array of frequency in SP804Timer, Philippe Mathieu-Daudé, 2023/07/04
- [PATCH v2 16/19] hw/timer/arm_timer: Extract icp_pit_realize() from icp_pit_init(), Philippe Mathieu-Daudé, 2023/07/04