[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/14] hw/timmer: QOM'ify exynos4210_pwm
From: |
xiaoqiang zhao |
Subject: |
[Qemu-devel] [PATCH 04/14] hw/timmer: QOM'ify exynos4210_pwm |
Date: |
Tue, 26 Jan 2016 18:55:43 +0800 |
assign exynos4210_pwm_init to exynos4210_pwm_info.instance_init
and drop the SysBusDeviceClass::init
Signed-off-by: xiaoqiang zhao <address@hidden>
---
hw/timer/exynos4210_pwm.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/timer/exynos4210_pwm.c b/hw/timer/exynos4210_pwm.c
index 1c1a2b8..3ac2bf5 100644
--- a/hw/timer/exynos4210_pwm.c
+++ b/hw/timer/exynos4210_pwm.c
@@ -379,9 +379,10 @@ static const MemoryRegionOps exynos4210_pwm_ops = {
/*
* PWM timer initialization
*/
-static int exynos4210_pwm_init(SysBusDevice *dev)
+static void exynos4210_pwm_init(Object *obj)
{
- Exynos4210PWMState *s = EXYNOS4210_PWM(dev);
+ Exynos4210PWMState *s = EXYNOS4210_PWM(obj);
+ SysBusDevice *dev = SYS_BUS_DEVICE(obj);
int i;
QEMUBH *bh;
@@ -396,16 +397,12 @@ static int exynos4210_pwm_init(SysBusDevice *dev)
memory_region_init_io(&s->iomem, OBJECT(s), &exynos4210_pwm_ops, s,
"exynos4210-pwm", EXYNOS4210_PWM_REG_MEM_SIZE);
sysbus_init_mmio(dev, &s->iomem);
-
- return 0;
}
static void exynos4210_pwm_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = exynos4210_pwm_init;
dc->reset = exynos4210_pwm_reset;
dc->vmsd = &vmstate_exynos4210_pwm_state;
}
@@ -414,6 +411,7 @@ static const TypeInfo exynos4210_pwm_info = {
.name = TYPE_EXYNOS4210_PWM,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(Exynos4210PWMState),
+ .instance_init = exynos4210_pwm_init,
.class_init = exynos4210_pwm_class_init,
};
--
2.1.4
- [Qemu-devel] [PATCH 00/14] QOM'ify hw/timmer/*, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 08/14] hw/timmer: QOM'ify m48txx_sysbus, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 10/14] hw/timmer: QOM'ify pl031, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 02/14] hw/timmer: QOM'ify etraxfs_timer, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 09/14] hw/timmer: QOM'ify milkymist_sysctl, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 04/14] hw/timmer: QOM'ify exynos4210_pwm,
xiaoqiang zhao <=
- [Qemu-devel] [PATCH 03/14] hw/timmer: QOM'ify exynos4210_mct, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 06/14] hw/timmer: QOM'ify grlib_gptimer, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 01/14] hw/timmer: QOM'ify arm_timer, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 05/14] hw/timmer: QOM'ify exynos4210_rtc, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 07/14] hw/timmer: QOM'ify lm32_timer, xiaoqiang zhao, 2016/01/26
- Re: [Qemu-devel] [PATCH 00/14] QOM'ify hw/timmer/*, Eric Blake, 2016/01/26