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/spitz.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hw/spitz.c') diff --git a/hw/spitz.c b/hw/spitz.c index ab7ca80f6c..5bc49fcd27 100644 --- a/hw/spitz.c +++ b/hw/spitz.c @@ -156,7 +156,7 @@ static void sl_flash_register(PXA2xxState *cpu, int size) qdev_prop_set_uint8(dev, "chip_id", 0xf1); qdev_init_nofail(dev); - sysbus_mmio_map(sysbus_from_qdev(dev), 0, FLASH_BASE); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, FLASH_BASE); } static int sl_nand_init(SysBusDevice *dev) { @@ -459,7 +459,7 @@ static void spitz_keyboard_register(PXA2xxState *cpu) SpitzKeyboardState *s; dev = sysbus_create_simple("spitz-keyboard", -1, NULL); - s = FROM_SYSBUS(SpitzKeyboardState, sysbus_from_qdev(dev)); + s = FROM_SYSBUS(SpitzKeyboardState, SYS_BUS_DEVICE(dev)); for (i = 0; i < SPITZ_KEY_SENSE_NUM; i ++) qdev_connect_gpio_out(dev, i, qdev_get_gpio_in(cpu->gpio, spitz_gpio_key_sense[i])); -- cgit v1.2.3