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_gpio.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_gpio.c')
| -rw-r--r-- | hw/pxa2xx_gpio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/pxa2xx_gpio.c b/hw/pxa2xx_gpio.c index eec2ea3f1c..05d2ad2add 100644 --- a/hw/pxa2xx_gpio.c +++ b/hw/pxa2xx_gpio.c @@ -260,12 +260,12 @@ DeviceState *pxa2xx_gpio_init(hwaddr base, qdev_prop_set_int32(dev, "ncpu", cs->cpu_index); qdev_init_nofail(dev); - sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); - sysbus_connect_irq(sysbus_from_qdev(dev), 0, + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, qdev_get_gpio_in(pic, PXA2XX_PIC_GPIO_0)); - sysbus_connect_irq(sysbus_from_qdev(dev), 1, + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 1, qdev_get_gpio_in(pic, PXA2XX_PIC_GPIO_1)); - sysbus_connect_irq(sysbus_from_qdev(dev), 2, + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 2, qdev_get_gpio_in(pic, PXA2XX_PIC_GPIO_X)); return dev; @@ -297,7 +297,7 @@ static int pxa2xx_gpio_initfn(SysBusDevice *dev) */ void pxa2xx_gpio_read_notifier(DeviceState *dev, qemu_irq handler) { - PXA2xxGPIOInfo *s = FROM_SYSBUS(PXA2xxGPIOInfo, sysbus_from_qdev(dev)); + PXA2xxGPIOInfo *s = FROM_SYSBUS(PXA2xxGPIOInfo, SYS_BUS_DEVICE(dev)); s->read_notify = handler; } |