[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH 09/12] hw/misc: QOM'ify exynos4210_pmu.c
From: |
xiaoqiang zhao |
Subject: |
[Qemu-arm] [PATCH 09/12] hw/misc: QOM'ify exynos4210_pmu.c |
Date: |
Mon, 13 Jun 2016 18:32:08 +0800 |
Drop the old SysBus init function and use instance_init
Signed-off-by: xiaoqiang zhao <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,
};
--
2.1.4
- [Qemu-arm] [PATCH 00/12] some ARM platform QOM'ify work (update), xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [PATCH 01/12] hw/i2c: QOM'ify bitbang_i2c.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [PATCH 06/12] hw/gpio: QOM'ify pl061.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [PATCH 09/12] hw/misc: QOM'ify exynos4210_pmu.c,
xiaoqiang zhao <=
- [Qemu-arm] [PATCH 10/12] hw/misc: QOM'ify mst_fpga.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [PATCH 07/12] hw/gpio: QOM'ify zaurus.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [PATCH 03/12] hw/i2c: QOM'ify omap_i2c.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [PATCH 04/12] hw/i2c: QOM'ify versatile_i2c.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [PATCH 02/12] hw/i2c: QOM'ify exynos4210_i2c.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [PATCH 08/12] hw/misc: QOM'ify arm_l2x0.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [PATCH 05/12] hw/gpio: QOM'ify omap_gpio.c, xiaoqiang zhao, 2016/06/13
- Re: [Qemu-arm] [Qemu-devel] [PATCH 00/12] some ARM platform QOM'ify work (update), xiaoqiang zhao, 2016/06/13