From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56579) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t11-0003uw-V6 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0u-0002YS-On for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:55 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53400 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0u-0002YB-Dn for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:48 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:56 +0200 Message-Id: <1375125630-24869-80-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 079/173] omap_gpio: QOM cast cleanup for omap_gpif_s List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/gpio/omap_gpio.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c index 855afae..295caad 100644 --- a/hw/gpio/omap_gpio.c +++ b/hw/gpio/omap_gpio.c @@ -35,8 +35,13 @@ struct omap_gpio_s { uint16_t pins; }; =20 +#define TYPE_OMAP1_GPIO "omap-gpio" +#define OMAP1_GPIO(obj) \ + OBJECT_CHECK(struct omap_gpif_s, (obj), TYPE_OMAP1_GPIO) + struct omap_gpif_s { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; int mpu_model; void *clk; @@ -587,8 +592,8 @@ static const MemoryRegionOps omap2_gpio_module_ops =3D= { =20 static void omap_gpif_reset(DeviceState *dev) { - struct omap_gpif_s *s =3D FROM_SYSBUS(struct omap_gpif_s, - SYS_BUS_DEVICE(dev)); + struct omap_gpif_s *s =3D OMAP1_GPIO(dev); + omap_gpio_reset(&s->omap1); } =20 @@ -668,18 +673,20 @@ static const MemoryRegionOps omap2_gpif_top_ops =3D= { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static int omap_gpio_init(SysBusDevice *dev) +static int omap_gpio_init(SysBusDevice *sbd) { - struct omap_gpif_s *s =3D FROM_SYSBUS(struct omap_gpif_s, dev); + DeviceState *dev =3D DEVICE(sbd); + struct omap_gpif_s *s =3D OMAP1_GPIO(dev); + if (!s->clk) { hw_error("omap-gpio: clk not connected\n"); } - qdev_init_gpio_in(&dev->qdev, omap_gpio_set, 16); - qdev_init_gpio_out(&dev->qdev, s->omap1.handler, 16); - sysbus_init_irq(dev, &s->omap1.irq); + qdev_init_gpio_in(dev, omap_gpio_set, 16); + qdev_init_gpio_out(dev, s->omap1.handler, 16); + sysbus_init_irq(sbd, &s->omap1.irq); memory_region_init_io(&s->iomem, OBJECT(s), &omap_gpio_ops, &s->omap= 1, "omap.gpio", 0x1000); - sysbus_init_mmio(dev, &s->iomem); + sysbus_init_mmio(sbd, &s->iomem); return 0; } =20 @@ -748,7 +755,7 @@ static void omap_gpio_class_init(ObjectClass *klass, = void *data) } =20 static const TypeInfo omap_gpio_info =3D { - .name =3D "omap-gpio", + .name =3D TYPE_OMAP1_GPIO, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(struct omap_gpif_s), .class_init =3D omap_gpio_class_init, --=20 1.8.1.4