[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 109/173] exynos4210_pmu: QOM cast cleanup
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 109/173] exynos4210_pmu: QOM cast cleanup |
Date: |
Mon, 29 Jul 2013 21:19:26 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/misc/exynos4210_pmu.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/hw/misc/exynos4210_pmu.c b/hw/misc/exynos4210_pmu.c
index 28395ba..cbf0795 100644
--- a/hw/misc/exynos4210_pmu.c
+++ b/hw/misc/exynos4210_pmu.c
@@ -386,8 +386,13 @@ static const Exynos4210PmuReg exynos4210_pmu_regs[] = {
#define PMU_NUM_OF_REGISTERS \
(sizeof(exynos4210_pmu_regs) / sizeof(Exynos4210PmuReg))
+#define TYPE_EXYNOS4210_PMU "exynos4210.pmu"
+#define EXYNOS4210_PMU(obj) \
+ OBJECT_CHECK(Exynos4210PmuState, (obj), TYPE_EXYNOS4210_PMU)
+
typedef struct Exynos4210PmuState {
- SysBusDevice busdev;
+ SysBusDevice parent_obj;
+
MemoryRegion iomem;
uint32_t reg[PMU_NUM_OF_REGISTERS];
} Exynos4210PmuState;
@@ -443,8 +448,7 @@ static const MemoryRegionOps exynos4210_pmu_ops = {
static void exynos4210_pmu_reset(DeviceState *dev)
{
- Exynos4210PmuState *s =
- container_of(dev, Exynos4210PmuState, busdev.qdev);
+ Exynos4210PmuState *s = EXYNOS4210_PMU(dev);
unsigned i;
/* Set default values for registers */
@@ -455,7 +459,7 @@ static void exynos4210_pmu_reset(DeviceState *dev)
static int exynos4210_pmu_init(SysBusDevice *dev)
{
- Exynos4210PmuState *s = FROM_SYSBUS(Exynos4210PmuState, dev);
+ Exynos4210PmuState *s = EXYNOS4210_PMU(dev);
/* memory mapping */
memory_region_init_io(&s->iomem, OBJECT(dev), &exynos4210_pmu_ops, s,
@@ -485,7 +489,7 @@ static void exynos4210_pmu_class_init(ObjectClass *klass,
void *data)
}
static const TypeInfo exynos4210_pmu_info = {
- .name = "exynos4210.pmu",
+ .name = TYPE_EXYNOS4210_PMU,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(Exynos4210PmuState),
.class_init = exynos4210_pmu_class_init,
--
1.8.1.4
- [Qemu-devel] [PULL 092/173] etraxfs_pic: QOM cast cleanup, (continued)
- [Qemu-devel] [PULL 092/173] etraxfs_pic: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 093/173] exynos4210_combiner: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 096/173] grlib_irqmp: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 094/173] exynos4210_gic: QOM cast cleanup for exynos4210.gic, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 095/173] exynos4210_gic: QOM cast cleanup for exynos4210.irq_gate, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 097/173] lm32_pic: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 105/173] arm_l2x0: Rename l2x0_state to L2x0State, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 106/173] arm_l2x0: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 107/173] arm_sysctl: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 108/173] eccmemctl: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 109/173] exynos4210_pmu: QOM cast cleanup,
Andreas Färber <=
- [Qemu-devel] [PULL 110/173] lm32_sys: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 112/173] milkymist-pfpu: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 111/173] milkymist-hpdmc: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 116/173] slavio_misc: QOM cast cleanup for APCState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 113/173] mst_fpga: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 115/173] slavio_misc: QOM cast cleanup for MiscState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 114/173] puv3_pm: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 123/173] milkymist-minimac2: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 124/173] smc91c111: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 125/173] stellaris_enet: QOM cast cleanup, Andreas Färber, 2013/07/29