From 1356b98d3e95a85071e6bf9a99e8799e1ae1bbee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 20 Jan 2013 02:47:33 +0100 Subject: sysbus: Drop sysbus_from_qdev() cast macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Cc: Anthony Liguori Signed-off-by: Anthony Liguori --- hw/omap_i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hw/omap_i2c.c') diff --git a/hw/omap_i2c.c b/hw/omap_i2c.c index e0a5087f37..143b198f1d 100644 --- a/hw/omap_i2c.c +++ b/hw/omap_i2c.c @@ -131,7 +131,7 @@ static void omap_i2c_fifo_run(OMAPI2CState *s) static void omap_i2c_reset(DeviceState *dev) { OMAPI2CState *s = FROM_SYSBUS(OMAPI2CState, - sysbus_from_qdev(dev)); + SYS_BUS_DEVICE(dev)); s->mask = 0; s->stat = 0; s->dma = 0; @@ -485,7 +485,7 @@ static void omap_i2c_register_types(void) i2c_bus *omap_i2c_bus(DeviceState *omap_i2c) { - OMAPI2CState *s = FROM_SYSBUS(OMAPI2CState, sysbus_from_qdev(omap_i2c)); + OMAPI2CState *s = FROM_SYSBUS(OMAPI2CState, SYS_BUS_DEVICE(omap_i2c)); return s->bus; } -- cgit v1.2.3