From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57318) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1l-0004xA-C6 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1Z-0002px-0n for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:41 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53501 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1Y-0002pg-O5 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:28 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 50092A531D for ; Mon, 29 Jul 2013 21:22:28 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:51 +0200 Message-Id: <1375125630-24869-135-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 134/173] pl181: 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/sd/pl181.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index dc08595..03875bf 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -22,8 +22,12 @@ do { printf("pl181: " fmt , ## __VA_ARGS__); } while (= 0) =20 #define PL181_FIFO_LEN 16 =20 +#define TYPE_PL181 "pl181" +#define PL181(obj) OBJECT_CHECK(PL181State, (obj), TYPE_PL181) + typedef struct PL181State { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; SDState *card; uint32_t clock; @@ -449,7 +453,7 @@ static const MemoryRegionOps pl181_ops =3D { =20 static void pl181_reset(DeviceState *d) { - PL181State *s =3D DO_UPCAST(PL181State, busdev.qdev, d); + PL181State *s =3D PL181(d); =20 s->power =3D 0; s->cmdarg =3D 0; @@ -474,16 +478,17 @@ static void pl181_reset(DeviceState *d) sd_set_cb(s->card, s->cardstatus[0], s->cardstatus[1]); } =20 -static int pl181_init(SysBusDevice *dev) +static int pl181_init(SysBusDevice *sbd) { - PL181State *s =3D FROM_SYSBUS(PL181State, dev); + DeviceState *dev =3D DEVICE(sbd); + PL181State *s =3D PL181(dev); DriveInfo *dinfo; =20 memory_region_init_io(&s->iomem, OBJECT(s), &pl181_ops, s, "pl181", = 0x1000); - sysbus_init_mmio(dev, &s->iomem); - sysbus_init_irq(dev, &s->irq[0]); - sysbus_init_irq(dev, &s->irq[1]); - qdev_init_gpio_out(&s->busdev.qdev, s->cardstatus, 2); + sysbus_init_mmio(sbd, &s->iomem); + sysbus_init_irq(sbd, &s->irq[0]); + sysbus_init_irq(sbd, &s->irq[1]); + qdev_init_gpio_out(dev, s->cardstatus, 2); dinfo =3D drive_get_next(IF_SD); s->card =3D sd_init(dinfo ? dinfo->bdrv : NULL, false); return 0; @@ -501,7 +506,7 @@ static void pl181_class_init(ObjectClass *klass, void= *data) } =20 static const TypeInfo pl181_info =3D { - .name =3D "pl181", + .name =3D TYPE_PL181, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PL181State), .class_init =3D pl181_class_init, --=20 1.8.1.4