[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/37] timer/grlib_gptimer: Convert sysbus init funct
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 19/37] timer/grlib_gptimer: Convert sysbus init function to realize function |
Date: |
Thu, 13 Dec 2018 14:54:27 +0000 |
From: Mao Zhongyi <address@hidden>
Use DeviceClass rather than SysBusDeviceClass in
grlib_gptimer_class_init().
Cc: address@hidden
Signed-off-by: Mao Zhongyi <address@hidden>
Signed-off-by: Zhang Shengju <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
hw/timer/grlib_gptimer.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c
index 4ed96e970a7..183eddc0737 100644
--- a/hw/timer/grlib_gptimer.c
+++ b/hw/timer/grlib_gptimer.c
@@ -347,10 +347,11 @@ static void grlib_gptimer_reset(DeviceState *d)
}
}
-static int grlib_gptimer_init(SysBusDevice *dev)
+static void grlib_gptimer_realize(DeviceState *dev, Error **errp)
{
GPTimerUnit *unit = GRLIB_GPTIMER(dev);
unsigned int i;
+ SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
assert(unit->nr_timers > 0);
assert(unit->nr_timers <= GPTIMER_MAX_TIMERS);
@@ -366,7 +367,7 @@ static int grlib_gptimer_init(SysBusDevice *dev)
timer->id = i;
/* One IRQ line for each timer */
- sysbus_init_irq(dev, &timer->irq);
+ sysbus_init_irq(sbd, &timer->irq);
ptimer_set_freq(timer->ptimer, unit->freq_hz);
}
@@ -375,8 +376,7 @@ static int grlib_gptimer_init(SysBusDevice *dev)
unit, "gptimer",
UNIT_REG_SIZE + GPTIMER_REG_SIZE * unit->nr_timers);
- sysbus_init_mmio(dev, &unit->iomem);
- return 0;
+ sysbus_init_mmio(sbd, &unit->iomem);
}
static Property grlib_gptimer_properties[] = {
@@ -389,9 +389,8 @@ static Property grlib_gptimer_properties[] = {
static void grlib_gptimer_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = grlib_gptimer_init;
+ dc->realize = grlib_gptimer_realize;
dc->reset = grlib_gptimer_reset;
dc->props = grlib_gptimer_properties;
}
--
2.19.2
- [Qemu-devel] [PULL 36/37] target/arm: Use arm_hcr_el2_eff more places, (continued)
- [Qemu-devel] [PULL 36/37] target/arm: Use arm_hcr_el2_eff more places, Peter Maydell, 2018/12/13
- [Qemu-devel] [PULL 35/37] target/arm: Introduce arm_hcr_el2_eff, Peter Maydell, 2018/12/13
- [Qemu-devel] [PULL 29/37] target/arm: Add HCR_EL2 bits up to ARMv8.5, Peter Maydell, 2018/12/13
- [Qemu-devel] [PULL 27/37] hw/arm: versal: Correct the nr of IRQs to 192, Peter Maydell, 2018/12/13
- [Qemu-devel] [PULL 28/37] target/arm: Move id_aa64mmfr* to ARMISARegisters, Peter Maydell, 2018/12/13
- [Qemu-devel] [PULL 26/37] hw/arm: versal: Use IRQs 111 - 118 for virtio-mmio, Peter Maydell, 2018/12/13
- [Qemu-devel] [PULL 25/37] hw/arm: versal: Reduce number of virtio-mmio instances, Peter Maydell, 2018/12/13
- [Qemu-devel] [PULL 23/37] core/sysbus: remove the SysBusDeviceClass::init path, Peter Maydell, 2018/12/13
- [Qemu-devel] [PULL 24/37] hw/arm: versal: Remove bogus virtio-mmio creation, Peter Maydell, 2018/12/13
- [Qemu-devel] [PULL 22/37] xen_backend: remove xen_sysdev_init() function, Peter Maydell, 2018/12/13
- [Qemu-devel] [PULL 19/37] timer/grlib_gptimer: Convert sysbus init function to realize function,
Peter Maydell <=
- [Qemu-devel] [PULL 20/37] timer/puv3_ost: Convert sysbus init function to realize function, Peter Maydell, 2018/12/13
- [Qemu-devel] [PULL 21/37] usb/tusb6010: Convert sysbus init function to realize function, Peter Maydell, 2018/12/13
- [Qemu-devel] [PULL 18/37] timer/etraxfs_timer: Convert sysbus init function to realize function, Peter Maydell, 2018/12/13
- [Qemu-devel] [PULL 17/37] pci-bridge/dec: Convert sysbus init function to realize function, Peter Maydell, 2018/12/13
- [Qemu-devel] [PULL 15/37] puv3_pm.c: Convert sysbus init function to realize function, Peter Maydell, 2018/12/13
- [Qemu-devel] [PULL 16/37] nvram/ds1225y: Convert sysbus init function to realize function, Peter Maydell, 2018/12/13
- [Qemu-devel] [PULL 14/37] milkymist-pfpu: Convert sysbus init function to realize function, Peter Maydell, 2018/12/13
- Re: [Qemu-devel] [PULL 00/37] target-arm queue, Peter Maydell, 2018/12/14