From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56673) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t17-000468-7t for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0y-0002Zu-5n for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:01 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53408 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0x-0002Zh-Uu for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:52 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 83B1BA5388 for ; Mon, 29 Jul 2013 21:21:51 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:01 +0200 Message-Id: <1375125630-24869-85-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 084/173] gpio/zaurus: 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/gpio/zaurus.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/hw/gpio/zaurus.c b/hw/gpio/zaurus.c index c235c3e..dc79a8b 100644 --- a/hw/gpio/zaurus.c +++ b/hw/gpio/zaurus.c @@ -24,9 +24,13 @@ =20 /* SCOOP devices */ =20 +#define TYPE_SCOOP "scoop" +#define SCOOP(obj) OBJECT_CHECK(ScoopInfo, (obj), TYPE_SCOOP) + typedef struct ScoopInfo ScoopInfo; struct ScoopInfo { - SysBusDevice busdev; + SysBusDevice parent_obj; + qemu_irq handler[16]; MemoryRegion iomem; uint16_t status; @@ -162,16 +166,17 @@ static void scoop_gpio_set(void *opaque, int line, = int level) s->gpio_level &=3D ~(1 << line); } =20 -static int scoop_init(SysBusDevice *dev) +static int scoop_init(SysBusDevice *sbd) { - ScoopInfo *s =3D FROM_SYSBUS(ScoopInfo, dev); + DeviceState *dev =3D DEVICE(sbd); + ScoopInfo *s =3D SCOOP(dev); =20 s->status =3D 0x02; - qdev_init_gpio_out(&s->busdev.qdev, s->handler, 16); - qdev_init_gpio_in(&s->busdev.qdev, scoop_gpio_set, 16); + qdev_init_gpio_out(dev, s->handler, 16); + qdev_init_gpio_in(dev, scoop_gpio_set, 16); memory_region_init_io(&s->iomem, OBJECT(s), &scoop_ops, s, "scoop", = 0x1000); =20 - sysbus_init_mmio(dev, &s->iomem); + sysbus_init_mmio(sbd, &s->iomem); =20 return 0; } @@ -237,7 +242,7 @@ static void scoop_sysbus_class_init(ObjectClass *klas= s, void *data) } =20 static const TypeInfo scoop_sysbus_info =3D { - .name =3D "scoop", + .name =3D TYPE_SCOOP, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(ScoopInfo), .class_init =3D scoop_sysbus_class_init, --=20 1.8.1.4