From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2n9k-0000yH-J0 for qemu-devel@nongnu.org; Fri, 26 Jul 2013 14:54:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2n9j-0001iW-EJ for qemu-devel@nongnu.org; Fri, 26 Jul 2013 14:54:24 -0400 Received: from cantor2.suse.de ([195.135.220.15]:41728 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2n9j-0001iO-4v for qemu-devel@nongnu.org; Fri, 26 Jul 2013 14:54:23 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 26 Jul 2013 20:54:02 +0200 Message-Id: <1374864854-32454-4-git-send-email-afaerber@suse.de> In-Reply-To: <1374864854-32454-1-git-send-email-afaerber@suse.de> References: <1374864854-32454-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 03/15] exynos4210_combiner: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Maksim Kozlov , Igor Mitsyanko , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Evgeny Voevodin , Dmitry Solodkiy Signed-off-by: Andreas F=C3=A4rber --- hw/intc/exynos4210_combiner.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.= c index 3b40976..ef5e8eb 100644 --- a/hw/intc/exynos4210_combiner.c +++ b/hw/intc/exynos4210_combiner.c @@ -56,8 +56,13 @@ typedef struct CombinerGroupState { uint8_t src_pending; /* Pending source interrupts before mask= ing */ } CombinerGroupState; =20 +#define TYPE_EXYNOS4210_COMBINER "exynos4210.combiner" +#define EXYNOS4210_COMBINER(obj) \ + OBJECT_CHECK(Exynos4210CombinerState, (obj), TYPE_EXYNOS4210_COMBINE= R) + typedef struct Exynos4210CombinerState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; =20 struct CombinerGroupState group[IIC_NGRP]; @@ -402,24 +407,24 @@ static const MemoryRegionOps exynos4210_combiner_op= s =3D { /* * Internal Combiner initialization. */ -static int exynos4210_combiner_init(SysBusDevice *dev) +static int exynos4210_combiner_init(SysBusDevice *sbd) { + DeviceState *dev =3D DEVICE(sbd); + Exynos4210CombinerState *s =3D EXYNOS4210_COMBINER(dev); unsigned int i; - struct Exynos4210CombinerState *s =3D - FROM_SYSBUS(struct Exynos4210CombinerState, dev); =20 /* Allocate general purpose input signals and connect a handler to e= ach of * them */ - qdev_init_gpio_in(&s->busdev.qdev, exynos4210_combiner_handler, IIC_= NIRQ); + qdev_init_gpio_in(dev, exynos4210_combiner_handler, IIC_NIRQ); =20 /* Connect SysBusDev irqs to device specific irqs */ for (i =3D 0; i < IIC_NIRQ; i++) { - sysbus_init_irq(dev, &s->output_irq[i]); + sysbus_init_irq(sbd, &s->output_irq[i]); } =20 memory_region_init_io(&s->iomem, OBJECT(s), &exynos4210_combiner_ops= , s, - "exynos4210-combiner", IIC_REGION_SIZE); - sysbus_init_mmio(dev, &s->iomem); + "exynos4210-combiner", IIC_REGION_SIZE); + sysbus_init_mmio(sbd, &s->iomem); =20 return 0; } @@ -441,7 +446,7 @@ static void exynos4210_combiner_class_init(ObjectClas= s *klass, void *data) } =20 static const TypeInfo exynos4210_combiner_info =3D { - .name =3D "exynos4210.combiner", + .name =3D TYPE_EXYNOS4210_COMBINER, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(Exynos4210CombinerState), .class_init =3D exynos4210_combiner_class_init, --=20 1.8.1.4