From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V34gW-0003BG-Fo for qemu-devel@nongnu.org; Sat, 27 Jul 2013 09:37:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V34gR-0008IX-QA for qemu-devel@nongnu.org; Sat, 27 Jul 2013 09:37:24 -0400 Received: from cantor2.suse.de ([195.135.220.15]:36075 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V34gR-0008IC-DT for qemu-devel@nongnu.org; Sat, 27 Jul 2013 09:37:19 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id DFAB0A4EB7 for ; Sat, 27 Jul 2013 15:37:18 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 27 Jul 2013 15:37:02 +0200 Message-Id: <1374932223-7490-20-git-send-email-afaerber@suse.de> In-Reply-To: <1374932223-7490-1-git-send-email-afaerber@suse.de> References: <1374932223-7490-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-next for-1.6 19/20] tusb6010: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/timer/tusb6010.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/hw/timer/tusb6010.c b/hw/timer/tusb6010.c index 47b6809..c48ecf8 100644 --- a/hw/timer/tusb6010.c +++ b/hw/timer/tusb6010.c @@ -26,8 +26,12 @@ #include "hw/devices.h" #include "hw/sysbus.h" =20 +#define TYPE_TUSB6010 "tusb6010" +#define TUSB(obj) OBJECT_CHECK(TUSBState, (obj), TYPE_TUSB6010) + typedef struct TUSBState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem[2]; qemu_irq irq; MUSBState *musb; @@ -740,7 +744,7 @@ static void tusb6010_irq(void *opaque, int source, in= t level) =20 static void tusb6010_reset(DeviceState *dev) { - TUSBState *s =3D FROM_SYSBUS(TUSBState, SYS_BUS_DEVICE(dev)); + TUSBState *s =3D TUSB(dev); int i; =20 s->test_reset =3D TUSB_PROD_TEST_RESET_VAL; @@ -774,18 +778,20 @@ static void tusb6010_reset(DeviceState *dev) musb_reset(s->musb); } =20 -static int tusb6010_init(SysBusDevice *dev) +static int tusb6010_init(SysBusDevice *sbd) { - TUSBState *s =3D FROM_SYSBUS(TUSBState, dev); + DeviceState *dev =3D DEVICE(sbd); + TUSBState *s =3D TUSB(dev); + s->otg_timer =3D qemu_new_timer_ns(vm_clock, tusb_otg_tick, s); s->pwr_timer =3D qemu_new_timer_ns(vm_clock, tusb_power_tick, s); memory_region_init_io(&s->iomem[1], OBJECT(s), &tusb_async_ops, s, "tusb-async", UINT32_MAX); - sysbus_init_mmio(dev, &s->iomem[0]); - sysbus_init_mmio(dev, &s->iomem[1]); - sysbus_init_irq(dev, &s->irq); - qdev_init_gpio_in(&dev->qdev, tusb6010_irq, musb_irq_max + 1); - s->musb =3D musb_init(&dev->qdev, 1); + sysbus_init_mmio(sbd, &s->iomem[0]); + sysbus_init_mmio(sbd, &s->iomem[1]); + sysbus_init_irq(sbd, &s->irq); + qdev_init_gpio_in(dev, tusb6010_irq, musb_irq_max + 1); + s->musb =3D musb_init(dev, 1); return 0; } =20 @@ -799,7 +805,7 @@ static void tusb6010_class_init(ObjectClass *klass, v= oid *data) } =20 static const TypeInfo tusb6010_info =3D { - .name =3D "tusb6010", + .name =3D TYPE_TUSB6010, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(TUSBState), .class_init =3D tusb6010_class_init, --=20 1.8.1.4