[prev in list] [next in list] [prev in thread] [next in thread]
List: qemu-arm
Subject: [PATCH 08/15] hw/timer/arm_timer: Rename arm_timer_init() -> arm_timer_new()
From: Philippe Mathieu-Daudé <philmd () linaro ! org>
Date: 2023-05-31 20:35:52
Message-ID: 20230531203559.29140-9-philmd () linaro ! org
[Download RAW message or body]
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>
---
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 54318d0a57..1f4d66291a 100644
--- a/hw/timer/arm_timer.c
+++ b/hw/timer/arm_timer.c
@@ -177,7 +177,7 @@ static void arm_timer_reset(ArmTimerState *s)
s->control = TIMER_CTRL_IE;
}
-static ArmTimerState *arm_timer_init(uint32_t freq)
+static ArmTimerState *arm_timer_new(uint32_t freq)
{
ArmTimerState *s;
@@ -308,8 +308,8 @@ static void sp804_realize(DeviceState *dev, Error **errp)
{
SP804State *s = SP804(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);
}
@@ -394,10 +394,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
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic