[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/30] hw/gpio: QOM'ify pl061.c
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 14/30] hw/gpio: QOM'ify pl061.c |
Date: |
Tue, 14 Jun 2016 15:13:49 +0100 |
From: xiaoqiang zhao <address@hidden>
* Merge the pl061_initfn into pl061_init
* Drop the old SysBus init function and use instance_init
Signed-off-by: xiaoqiang zhao <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <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;
}
--
1.9.1
- [Qemu-devel] [PULL 00/30] target-arm queue, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 04/30] target-arm: Fix reset and migration of TTBCR(S), Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 05/30] hw/arm/virt: separate versioned type-init code, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 01/30] target-arm: kvm64: set guest PMUv3 feature bit if supported, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 12/30] hw/i2c: QOM'ify versatile_i2c.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 13/30] hw/gpio: QOM'ify omap_gpio.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 06/30] hw/arm/virt: introduce DEFINE_VIRT_MACHINE, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 14/30] hw/gpio: QOM'ify pl061.c,
Peter Maydell <=
- [Qemu-devel] [PULL 16/30] hw/misc: QOM'ify arm_l2x0.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 02/30] hw/arm/virt: Add PMU node for virt machine, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 15/30] hw/gpio: QOM'ify zaurus.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 08/30] hw/arm/virt: create the 2.7 machine type, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 10/30] hw/i2c: QOM'ify exynos4210_i2c.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 11/30] hw/i2c: QOM'ify omap_i2c.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 09/30] hw/i2c: QOM'ify bitbang_i2c.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 18/30] hw/misc: QOM'ify mst_fpga.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 17/30] hw/misc: QOM'ify exynos4210_pmu.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 23/30] i2c: Factor our send() and recv() common logic, Peter Maydell, 2016/06/14