[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/22] gpio/puv3_gpio: Convert sysbus init function
From: |
Mao Zhongyi |
Subject: |
[Qemu-devel] [PATCH 07/22] gpio/puv3_gpio: Convert sysbus init function to realize function |
Date: |
Mon, 19 Nov 2018 20:08:05 +0800 |
Use DeviceClass rather than SysBusDeviceClass in
puv3_gpio_class_init().
Cc: address@hidden
Signed-off-by: Mao Zhongyi <address@hidden>
Signed-off-by: Zhang Shengju <address@hidden>
---
hw/gpio/puv3_gpio.c | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/hw/gpio/puv3_gpio.c b/hw/gpio/puv3_gpio.c
index 445afccf9f..bd6fc43aae 100644
--- a/hw/gpio/puv3_gpio.c
+++ b/hw/gpio/puv3_gpio.c
@@ -99,7 +99,7 @@ static const MemoryRegionOps puv3_gpio_ops = {
.endianness = DEVICE_NATIVE_ENDIAN,
};
-static int puv3_gpio_init(SysBusDevice *dev)
+static void puv3_gpio_realize(DeviceState *dev, Error **errp)
{
PUV3GPIOState *s = PUV3_GPIO(dev);
@@ -107,28 +107,26 @@ static int puv3_gpio_init(SysBusDevice *dev)
s->reg_GPDR = 0;
/* FIXME: these irqs not handled yet */
- sysbus_init_irq(dev, &s->irq[PUV3_IRQS_GPIOLOW0]);
- sysbus_init_irq(dev, &s->irq[PUV3_IRQS_GPIOLOW1]);
- sysbus_init_irq(dev, &s->irq[PUV3_IRQS_GPIOLOW2]);
- sysbus_init_irq(dev, &s->irq[PUV3_IRQS_GPIOLOW3]);
- sysbus_init_irq(dev, &s->irq[PUV3_IRQS_GPIOLOW4]);
- sysbus_init_irq(dev, &s->irq[PUV3_IRQS_GPIOLOW5]);
- sysbus_init_irq(dev, &s->irq[PUV3_IRQS_GPIOLOW6]);
- sysbus_init_irq(dev, &s->irq[PUV3_IRQS_GPIOLOW7]);
- sysbus_init_irq(dev, &s->irq[PUV3_IRQS_GPIOHIGH]);
+ sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq[PUV3_IRQS_GPIOLOW0]);
+ sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq[PUV3_IRQS_GPIOLOW1]);
+ sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq[PUV3_IRQS_GPIOLOW2]);
+ sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq[PUV3_IRQS_GPIOLOW3]);
+ sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq[PUV3_IRQS_GPIOLOW4]);
+ sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq[PUV3_IRQS_GPIOLOW5]);
+ sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq[PUV3_IRQS_GPIOLOW6]);
+ sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq[PUV3_IRQS_GPIOLOW7]);
+ sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq[PUV3_IRQS_GPIOHIGH]);
memory_region_init_io(&s->iomem, OBJECT(s), &puv3_gpio_ops, s, "puv3_gpio",
PUV3_REGS_OFFSET);
- sysbus_init_mmio(dev, &s->iomem);
-
- return 0;
+ sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem);
}
static void puv3_gpio_class_init(ObjectClass *klass, void *data)
{
- SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);
+ DeviceClass *dc = DEVICE_CLASS(klass);
- sdc->init = puv3_gpio_init;
+ dc->realize = puv3_gpio_realize;
}
static const TypeInfo puv3_gpio_info = {
--
2.17.1
- Re: [Qemu-devel] [PATCH 21/22] event-facility: Change SysBusDeviceClass *sbdc to SysBusDeviceClass *sbc, (continued)
[Qemu-devel] [PATCH 10/22] intc/puv3_intc: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19
[Qemu-devel] [PATCH 01/22] musicpal: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19
[Qemu-devel] [PATCH 03/22] char/grlib_apbuart: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19
[Qemu-devel] [PATCH 19/22] usb/tusb6010: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19
[Qemu-devel] [PATCH 17/22] timer/grlib_gptimer: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19
[Qemu-devel] [PATCH 16/22] timer/etraxfs_timer: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19
[Qemu-devel] [PATCH 02/22] block/noenand: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19
[Qemu-devel] [PATCH 07/22] gpio/puv3_gpio: Convert sysbus init function to realize function,
Mao Zhongyi <=
[Qemu-devel] [PATCH 13/22] puv3_pm.c: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19
[Qemu-devel] [PATCH 05/22] display/g364fb: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19
[Qemu-devel] [PATCH 18/22] timer/puv3_ost: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19
Re: [Qemu-devel] [PATCH 00/22] QOM'ify SysBusDeviceClass->init, Cornelia Huck, 2018/11/19