From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2n9r-00017p-BC for qemu-devel@nongnu.org; Fri, 26 Jul 2013 14:54:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2n9p-0001lU-9y for qemu-devel@nongnu.org; Fri, 26 Jul 2013 14:54:31 -0400 Received: from cantor2.suse.de ([195.135.220.15]:41748 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2n9p-0001l6-1I for qemu-devel@nongnu.org; Fri, 26 Jul 2013 14:54:29 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 26 Jul 2013 20:54:11 +0200 Message-Id: <1374864854-32454-13-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 12/15] puv3_intc: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Guan Xuetao , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/intc/puv3_intc.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/hw/intc/puv3_intc.c b/hw/intc/puv3_intc.c index 44b6651..c2803d0 100644 --- a/hw/intc/puv3_intc.c +++ b/hw/intc/puv3_intc.c @@ -13,8 +13,12 @@ #undef DEBUG_PUV3 #include "hw/unicore32/puv3.h" =20 -typedef struct { - SysBusDevice busdev; +#define TYPE_PUV3_INTC "puv3_intc" +#define PUV3_INTC(obj) OBJECT_CHECK(PUV3INTCState, (obj), TYPE_PUV3_INTC= ) + +typedef struct PUV3INTCState { + SysBusDevice parent_obj; + MemoryRegion iomem; qemu_irq parent_irq; =20 @@ -96,19 +100,20 @@ static const MemoryRegionOps puv3_intc_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static int puv3_intc_init(SysBusDevice *dev) +static int puv3_intc_init(SysBusDevice *sbd) { - PUV3INTCState *s =3D FROM_SYSBUS(PUV3INTCState, dev); + DeviceState *dev =3D DEVICE(sbd); + PUV3INTCState *s =3D PUV3_INTC(dev); =20 - qdev_init_gpio_in(&s->busdev.qdev, puv3_intc_handler, PUV3_IRQS_NR); - sysbus_init_irq(&s->busdev, &s->parent_irq); + qdev_init_gpio_in(dev, puv3_intc_handler, PUV3_IRQS_NR); + sysbus_init_irq(sbd, &s->parent_irq); =20 s->reg_ICMR =3D 0; s->reg_ICPR =3D 0; =20 memory_region_init_io(&s->iomem, OBJECT(s), &puv3_intc_ops, s, "puv3= _intc", - PUV3_REGS_OFFSET); - sysbus_init_mmio(dev, &s->iomem); + PUV3_REGS_OFFSET); + sysbus_init_mmio(sbd, &s->iomem); =20 return 0; } @@ -121,7 +126,7 @@ static void puv3_intc_class_init(ObjectClass *klass, = void *data) } =20 static const TypeInfo puv3_intc_info =3D { - .name =3D "puv3_intc", + .name =3D TYPE_PUV3_INTC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PUV3INTCState), .class_init =3D puv3_intc_class_init, --=20 1.8.1.4