[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/30] hw/misc: QOM'ify exynos4210_pmu.c
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 17/30] hw/misc: QOM'ify exynos4210_pmu.c |
Date: |
Tue, 14 Jun 2016 15:13:52 +0100 |
From: xiaoqiang zhao <address@hidden>
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/misc/exynos4210_pmu.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/hw/misc/exynos4210_pmu.c b/hw/misc/exynos4210_pmu.c
index 889abad..e30dbc7 100644
--- a/hw/misc/exynos4210_pmu.c
+++ b/hw/misc/exynos4210_pmu.c
@@ -457,15 +457,15 @@ static void exynos4210_pmu_reset(DeviceState *dev)
}
}
-static int exynos4210_pmu_init(SysBusDevice *dev)
+static void exynos4210_pmu_init(Object *obj)
{
- Exynos4210PmuState *s = EXYNOS4210_PMU(dev);
+ Exynos4210PmuState *s = EXYNOS4210_PMU(obj);
+ SysBusDevice *dev = SYS_BUS_DEVICE(obj);
/* memory mapping */
- memory_region_init_io(&s->iomem, OBJECT(dev), &exynos4210_pmu_ops, s,
+ memory_region_init_io(&s->iomem, obj, &exynos4210_pmu_ops, s,
"exynos4210.pmu", EXYNOS4210_PMU_REGS_MEM_SIZE);
sysbus_init_mmio(dev, &s->iomem);
- return 0;
}
static const VMStateDescription exynos4210_pmu_vmstate = {
@@ -481,9 +481,7 @@ static const VMStateDescription exynos4210_pmu_vmstate = {
static void exynos4210_pmu_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = exynos4210_pmu_init;
dc->reset = exynos4210_pmu_reset;
dc->vmsd = &exynos4210_pmu_vmstate;
}
@@ -492,6 +490,7 @@ static const TypeInfo exynos4210_pmu_info = {
.name = TYPE_EXYNOS4210_PMU,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(Exynos4210PmuState),
+ .instance_init = exynos4210_pmu_init,
.class_init = exynos4210_pmu_class_init,
};
--
1.9.1
- [Qemu-devel] [PULL 06/30] hw/arm/virt: introduce DEFINE_VIRT_MACHINE, (continued)
- [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, 2016/06/14
- [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 <=
- [Qemu-devel] [PULL 23/30] i2c: Factor our send() and recv() common logic, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 22/30] i2c: implement broadcast write, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 29/30] arm: xlnx-zynqmp: Add xlnx-dp and xlnx-dpdma, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 30/30] target-arm: Don't permit ARMv8-only Neon insns on ARMv7, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 21/30] i2cbus: remove unused dev field, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 20/30] hw/sd: QOM'ify pl181.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 24/30] introduce aux-bus, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 03/30] hw/arm/virt-acpi-build: Add PMU IRQ number in ACPI table, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 27/30] introduce xlnx-dpdma, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 07/30] hw/arm/virt: introduce DEFINE_VIRT_MACHINE_AS_LATEST, Peter Maydell, 2016/06/14