[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [RESEND PATCH 06/12] hw/gpio: QOM'ify pl061.c
From: |
xiaoqiang zhao |
Subject: |
[Qemu-arm] [RESEND PATCH 06/12] hw/gpio: QOM'ify pl061.c |
Date: |
Mon, 13 Jun 2016 18:54:09 +0800 |
* Merge the pl061_initfn into pl061_init
* Drop the old SysBus init function and use instance_init
Signed-off-by: xiaoqiang zhao <address@hidden>
---
hw/gpio/pl061.c | 24 ++++++++----------------
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git a/hw/gpio/pl061.c b/hw/gpio/pl061.c
index 44faeb2..4ae2aa1 100644
--- a/hw/gpio/pl061.c
+++ b/hw/gpio/pl061.c
@@ -341,20 +341,6 @@ static const MemoryRegionOps pl061_ops = {
.endianness = DEVICE_NATIVE_ENDIAN,
};
-static int pl061_initfn(SysBusDevice *sbd)
-{
- DeviceState *dev = DEVICE(sbd);
- PL061State *s = PL061(dev);
-
- memory_region_init_io(&s->iomem, OBJECT(s), &pl061_ops, s, "pl061",
0x1000);
- sysbus_init_mmio(sbd, &s->iomem);
- sysbus_init_irq(sbd, &s->irq);
- qdev_init_gpio_in(dev, pl061_set_irq, 8);
- qdev_init_gpio_out(dev, s->out, 8);
-
- return 0;
-}
-
static void pl061_luminary_init(Object *obj)
{
PL061State *s = PL061(obj);
@@ -366,17 +352,23 @@ static void pl061_luminary_init(Object *obj)
static void pl061_init(Object *obj)
{
PL061State *s = PL061(obj);
+ DeviceState *dev = DEVICE(obj);
+ SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
s->id = pl061_id;
s->rsvd_start = 0x424;
+
+ memory_region_init_io(&s->iomem, obj, &pl061_ops, s, "pl061", 0x1000);
+ sysbus_init_mmio(sbd, &s->iomem);
+ sysbus_init_irq(sbd, &s->irq);
+ qdev_init_gpio_in(dev, pl061_set_irq, 8);
+ qdev_init_gpio_out(dev, s->out, 8);
}
static void pl061_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = pl061_initfn;
dc->vmsd = &vmstate_pl061;
dc->reset = &pl061_reset;
}
--
2.1.4
- [Qemu-arm] [RESEND PATCH 00/12] some ARM platform QOM'ify work (resend), xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 02/12] hw/i2c: QOM'ify exynos4210_i2c.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 05/12] hw/gpio: QOM'ify omap_gpio.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 01/12] hw/i2c: QOM'ify bitbang_i2c.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 04/12] hw/i2c: QOM'ify versatile_i2c.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 08/12] hw/misc: QOM'ify arm_l2x0.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 06/12] hw/gpio: QOM'ify pl061.c,
xiaoqiang zhao <=
- [Qemu-arm] [RESEND PATCH 09/12] hw/misc: QOM'ify exynos4210_pmu.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 12/12] hw/sd: QOM'ify pl181.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 10/12] hw/misc: QOM'ify mst_fpga.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 11/12] hw/dma: QOM'ify pxa2xx_dma.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 07/12] hw/gpio: QOM'ify zaurus.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 03/12] hw/i2c: QOM'ify omap_i2c.c, xiaoqiang zhao, 2016/06/13
- Re: [Qemu-arm] [RESEND PATCH 00/12] some ARM platform QOM'ify work (resend), Peter Maydell, 2016/06/14