From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57054) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1U-0004oH-6H for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1I-0002jV-Al for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:24 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53463 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1I-0002jQ-4s for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:12 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id B2648A531D for ; Mon, 29 Jul 2013 21:22:11 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:28 +0200 Message-Id: <1375125630-24869-112-git-send-email-afaerber@suse.de> In-Reply-To: <1375125630-24869-1-git-send-email-afaerber@suse.de> References: <1375125630-24869-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] [PULL 111/173] milkymist-hpdmc: 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/misc/milkymist-hpdmc.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/misc/milkymist-hpdmc.c b/hw/misc/milkymist-hpdmc.c index a498881..aef135e 100644 --- a/hw/misc/milkymist-hpdmc.c +++ b/hw/misc/milkymist-hpdmc.c @@ -40,8 +40,13 @@ enum { IODELAY_PLL2_LOCKED =3D (1<<7), }; =20 +#define TYPE_MILKYMIST_HPDMC "milkymist-hpdmc" +#define MILKYMIST_HPDMC(obj) \ + OBJECT_CHECK(MilkymistHpdmcState, (obj), TYPE_MILKYMIST_HPDMC) + struct MilkymistHpdmcState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion regs_region; =20 uint32_t regs[R_MAX]; @@ -111,7 +116,7 @@ static const MemoryRegionOps hpdmc_mmio_ops =3D { =20 static void milkymist_hpdmc_reset(DeviceState *d) { - MilkymistHpdmcState *s =3D container_of(d, MilkymistHpdmcState, busd= ev.qdev); + MilkymistHpdmcState *s =3D MILKYMIST_HPDMC(d); int i; =20 for (i =3D 0; i < R_MAX; i++) { @@ -125,7 +130,7 @@ static void milkymist_hpdmc_reset(DeviceState *d) =20 static int milkymist_hpdmc_init(SysBusDevice *dev) { - MilkymistHpdmcState *s =3D FROM_SYSBUS(typeof(*s), dev); + MilkymistHpdmcState *s =3D MILKYMIST_HPDMC(dev); =20 memory_region_init_io(&s->regs_region, OBJECT(dev), &hpdmc_mmio_ops,= s, "milkymist-hpdmc", R_MAX * 4); @@ -156,7 +161,7 @@ static void milkymist_hpdmc_class_init(ObjectClass *k= lass, void *data) } =20 static const TypeInfo milkymist_hpdmc_info =3D { - .name =3D "milkymist-hpdmc", + .name =3D TYPE_MILKYMIST_HPDMC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(MilkymistHpdmcState), .class_init =3D milkymist_hpdmc_class_init, --=20 1.8.1.4