From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56195) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0d-0003AF-2y for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0W-0002Oz-Pu for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:30 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53329 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0W-0002Os-KM for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:24 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:26 +0200 Message-Id: <1375125630-24869-50-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 049/173] spitz: QOM cast cleanup for SLNANDState 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?= , Paul Brook Introduce a type constant, use QOM casts and rename the parent field. Signed-off-by: Andreas F=C3=A4rber --- hw/arm/spitz.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index 593b75e..0bf5c5c 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -50,8 +50,12 @@ #define FLASHCTL_RYBY (1 << 5) #define FLASHCTL_NCE (FLASHCTL_CE0 | FLASHCTL_CE1) =20 +#define TYPE_SL_NAND "sl-nand" +#define SL_NAND(obj) OBJECT_CHECK(SLNANDState, (obj), TYPE_SL_NAND) + typedef struct { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; DeviceState *nand; uint8_t ctl; @@ -147,7 +151,7 @@ static void sl_flash_register(PXA2xxState *cpu, int s= ize) { DeviceState *dev; =20 - dev =3D qdev_create(NULL, "sl-nand"); + dev =3D qdev_create(NULL, TYPE_SL_NAND); =20 qdev_prop_set_uint8(dev, "manf_id", NAND_MFR_SAMSUNG); if (size =3D=3D FLASH_128M) @@ -159,12 +163,11 @@ static void sl_flash_register(PXA2xxState *cpu, int= size) sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, FLASH_BASE); } =20 -static int sl_nand_init(SysBusDevice *dev) { - SLNANDState *s; +static int sl_nand_init(SysBusDevice *dev) +{ + SLNANDState *s =3D SL_NAND(dev); DriveInfo *nand; =20 - s =3D FROM_SYSBUS(SLNANDState, dev); - s->ctl =3D 0; nand =3D drive_get(IF_MTD, 0, 0); s->nand =3D nand_init(nand ? nand->bdrv : NULL, s->manf_id, s->chip_= id); @@ -1027,7 +1030,7 @@ static void sl_nand_class_init(ObjectClass *klass, = void *data) } =20 static const TypeInfo sl_nand_info =3D { - .name =3D "sl-nand", + .name =3D TYPE_SL_NAND, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(SLNANDState), .class_init =3D sl_nand_class_init, --=20 1.8.1.4