From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46605) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2kw5-0007Be-HI for qemu-devel@nongnu.org; Fri, 26 Jul 2013 12:32:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2kw2-0000o3-H5 for qemu-devel@nongnu.org; Fri, 26 Jul 2013 12:32:09 -0400 Received: from cantor2.suse.de ([195.135.220.15]:37350 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2kw2-0000ni-8s for qemu-devel@nongnu.org; Fri, 26 Jul 2013 12:32:06 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 26 Jul 2013 18:32:00 +0200 Message-Id: <1374856321-17786-3-git-send-email-afaerber@suse.de> In-Reply-To: <1374856321-17786-1-git-send-email-afaerber@suse.de> References: <1374856321-17786-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 2/3] omap_i2c: QOM cast cleanup 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/i2c/omap_i2c.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c index f0eb448..f528b2b 100644 --- a/hw/i2c/omap_i2c.c +++ b/hw/i2c/omap_i2c.c @@ -21,9 +21,12 @@ #include "hw/arm/omap.h" #include "hw/sysbus.h" =20 +#define TYPE_OMAP_I2C "omap_i2c" +#define OMAP_I2C(obj) OBJECT_CHECK(OMAPI2CState, (obj), TYPE_OMAP_I2C) =20 typedef struct OMAPI2CState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; qemu_irq irq; qemu_irq drq[2]; @@ -130,8 +133,8 @@ static void omap_i2c_fifo_run(OMAPI2CState *s) =20 static void omap_i2c_reset(DeviceState *dev) { - OMAPI2CState *s =3D FROM_SYSBUS(OMAPI2CState, - SYS_BUS_DEVICE(dev)); + OMAPI2CState *s =3D OMAP_I2C(dev); + s->mask =3D 0; s->stat =3D 0; s->dma =3D 0; @@ -316,15 +319,17 @@ static void omap_i2c_write(void *opaque, hwaddr add= r, return; } =20 - if (value & 2) - omap_i2c_reset(&s->busdev.qdev); + if (value & 2) { + omap_i2c_reset(DEVICE(s)); + } break; =20 case 0x24: /* I2C_CON */ s->control =3D value & 0xcf87; if (~value & (1 << 15)) { /* I2C_EN */ - if (s->revision < OMAP2_INTR_REV) - omap_i2c_reset(&s->busdev.qdev); + if (s->revision < OMAP2_INTR_REV) { + omap_i2c_reset(DEVICE(s)); + } break; } if ((value & (1 << 15)) && !(value & (1 << 10))) { /* MST */ @@ -434,9 +439,10 @@ static const MemoryRegionOps omap_i2c_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static int omap_i2c_init(SysBusDevice *dev) +static int omap_i2c_init(SysBusDevice *sbd) { - OMAPI2CState *s =3D FROM_SYSBUS(OMAPI2CState, dev); + DeviceState *dev =3D DEVICE(sbd); + OMAPI2CState *s =3D OMAP_I2C(dev); =20 if (!s->fclk) { hw_error("omap_i2c: fclk not connected\n"); @@ -445,13 +451,13 @@ static int omap_i2c_init(SysBusDevice *dev) /* Note that OMAP1 doesn't have a separate interface clock */ hw_error("omap_i2c: iclk not connected\n"); } - sysbus_init_irq(dev, &s->irq); - sysbus_init_irq(dev, &s->drq[0]); - sysbus_init_irq(dev, &s->drq[1]); + sysbus_init_irq(sbd, &s->irq); + sysbus_init_irq(sbd, &s->drq[0]); + sysbus_init_irq(sbd, &s->drq[1]); memory_region_init_io(&s->iomem, OBJECT(s), &omap_i2c_ops, s, "omap.= i2c", (s->revision < OMAP2_INTR_REV) ? 0x800 : 0x100= 0); - sysbus_init_mmio(dev, &s->iomem); - s->bus =3D i2c_init_bus(&dev->qdev, NULL); + sysbus_init_mmio(sbd, &s->iomem); + s->bus =3D i2c_init_bus(dev, NULL); return 0; } =20 @@ -472,7 +478,7 @@ static void omap_i2c_class_init(ObjectClass *klass, v= oid *data) } =20 static const TypeInfo omap_i2c_info =3D { - .name =3D "omap_i2c", + .name =3D TYPE_OMAP_I2C, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(OMAPI2CState), .class_init =3D omap_i2c_class_init, @@ -485,7 +491,7 @@ static void omap_i2c_register_types(void) =20 i2c_bus *omap_i2c_bus(DeviceState *omap_i2c) { - OMAPI2CState *s =3D FROM_SYSBUS(OMAPI2CState, SYS_BUS_DEVICE(omap_i2= c)); + OMAPI2CState *s =3D OMAP_I2C(omap_i2c); return s->bus; } =20 --=20 1.8.1.4