diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-01-20 02:47:33 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-21 13:52:24 -0600 |
| commit | 1356b98d3e95a85071e6bf9a99e8799e1ae1bbee (patch) | |
| tree | 26b8c982dec9507ac71f29914dfe09f0cfb9a848 /hw/pxa2xx_pic.c | |
| parent | 6fd8e79af031d8cfc0eb02d40d03281917fcb27b (diff) | |
sysbus: Drop sysbus_from_qdev() cast macro
Replace by SYS_BUS_DEVICE() QOM cast macro using a scripted conversion.
Avoids the old macro creeping into new code.
Resolve a Coding Style warning in openpic code.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Cc: Anthony Liguori <anthony@codemonkey.ws>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/pxa2xx_pic.c')
| -rw-r--r-- | hw/pxa2xx_pic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/pxa2xx_pic.c b/hw/pxa2xx_pic.c index 138245b0f9..90b8fef3f9 100644 --- a/hw/pxa2xx_pic.c +++ b/hw/pxa2xx_pic.c @@ -261,7 +261,7 @@ DeviceState *pxa2xx_pic_init(hwaddr base, ARMCPU *cpu) { CPUARMState *env = &cpu->env; DeviceState *dev = qdev_create(NULL, "pxa2xx_pic"); - PXA2xxPICState *s = FROM_SYSBUS(PXA2xxPICState, sysbus_from_qdev(dev)); + PXA2xxPICState *s = FROM_SYSBUS(PXA2xxPICState, SYS_BUS_DEVICE(dev)); s->cpu = cpu; @@ -279,8 +279,8 @@ DeviceState *pxa2xx_pic_init(hwaddr base, ARMCPU *cpu) /* Enable IC memory-mapped registers access. */ memory_region_init_io(&s->iomem, &pxa2xx_pic_ops, s, "pxa2xx-pic", 0x00100000); - sysbus_init_mmio(sysbus_from_qdev(dev), &s->iomem); - sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); /* Enable IC coprocessor access. */ define_arm_cp_regs_with_opaque(arm_env_get_cpu(env), pxa_pic_cp_reginfo, s); |