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/strongarm.c | |
| parent | 6fd8e79af031d8cfc0eb02d40d03281917fcb27b (diff) | |
| download | focaccia-qemu-1356b98d3e95a85071e6bf9a99e8799e1ae1bbee.tar.gz focaccia-qemu-1356b98d3e95a85071e6bf9a99e8799e1ae1bbee.zip | |
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/strongarm.c')
| -rw-r--r-- | hw/strongarm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/strongarm.c b/hw/strongarm.c index af688ac4ca..ab736e300e 100644 --- a/hw/strongarm.c +++ b/hw/strongarm.c @@ -619,9 +619,9 @@ static DeviceState *strongarm_gpio_init(hwaddr base, dev = qdev_create(NULL, "strongarm-gpio"); qdev_init_nofail(dev); - sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); for (i = 0; i < 12; i++) - sysbus_connect_irq(sysbus_from_qdev(dev), i, + sysbus_connect_irq(SYS_BUS_DEVICE(dev), i, qdev_get_gpio_in(pic, SA_PIC_GPIO0_EDGE + i)); return dev; @@ -1597,9 +1597,9 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem, DeviceState *dev = qdev_create(NULL, "strongarm-uart"); qdev_prop_set_chr(dev, "chardev", serial_hds[i]); qdev_init_nofail(dev); - sysbus_mmio_map(sysbus_from_qdev(dev), 0, + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, sa_serial[i].io_base); - sysbus_connect_irq(sysbus_from_qdev(dev), 0, + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, qdev_get_gpio_in(s->pic, sa_serial[i].irq)); } |