vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/misc: QOM'ify exynos4210_pmu.c 

Drop the old SysBus init function and use instance_init

Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
Message-id: 1465815255-21776-10-git-send-email-zxq_yx_007@163.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
master
xiaoqiang zhao 2016-06-14 15:59:14 +01:00 committed by Peter Maydell
parent da8060bfc0
commit b4ebbab9a1
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/misc/exynos4210_pmu.c
View File

@ -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 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); "exynos4210.pmu", EXYNOS4210_PMU_REGS_MEM_SIZE);
sysbus_init_mmio(dev, &s->iomem); sysbus_init_mmio(dev, &s->iomem);
return 0;
} }
static const VMStateDescription exynos4210_pmu_vmstate = { 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) static void exynos4210_pmu_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
k->init = exynos4210_pmu_init;
dc->reset = exynos4210_pmu_reset; dc->reset = exynos4210_pmu_reset;
dc->vmsd = &exynos4210_pmu_vmstate; dc->vmsd = &exynos4210_pmu_vmstate;
} }
@ -492,6 +490,7 @@ static const TypeInfo exynos4210_pmu_info = {
.name = TYPE_EXYNOS4210_PMU, .name = TYPE_EXYNOS4210_PMU,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(Exynos4210PmuState), .instance_size = sizeof(Exynos4210PmuState),
.instance_init = exynos4210_pmu_init,
.class_init = exynos4210_pmu_class_init, .class_init = exynos4210_pmu_class_init,
}; };