From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57104) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1X-0004oo-JP for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1M-0002l7-9m for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:27 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53471 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1M-0002ks-1n for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:16 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:34 +0200 Message-Id: <1375125630-24869-118-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 117/173] zynq_slcr: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/misc/zynq_slcr.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c index fc7a85f..e42a5b0 100644 --- a/hw/misc/zynq_slcr.c +++ b/hw/misc/zynq_slcr.c @@ -114,8 +114,12 @@ typedef enum { RESET_MAX } ResetValues; =20 -typedef struct { - SysBusDevice busdev; +#define TYPE_ZYNQ_SLCR "xilinx,zynq_slcr" +#define ZYNQ_SLCR(obj) OBJECT_CHECK(ZynqSLCRState, (obj), TYPE_ZYNQ_SLCR= ) + +typedef struct ZynqSLCRState { + SysBusDevice parent_obj; + MemoryRegion iomem; =20 union { @@ -158,9 +162,8 @@ typedef struct { =20 static void zynq_slcr_reset(DeviceState *d) { + ZynqSLCRState *s =3D ZYNQ_SLCR(d); int i; - ZynqSLCRState *s =3D - FROM_SYSBUS(ZynqSLCRState, SYS_BUS_DEVICE(d)); =20 DB_PRINT("RESET\n"); =20 @@ -492,7 +495,7 @@ static const MemoryRegionOps slcr_ops =3D { =20 static int zynq_slcr_init(SysBusDevice *dev) { - ZynqSLCRState *s =3D FROM_SYSBUS(ZynqSLCRState, dev); + ZynqSLCRState *s =3D ZYNQ_SLCR(dev); =20 memory_region_init_io(&s->iomem, OBJECT(s), &slcr_ops, s, "slcr", 0x= 1000); sysbus_init_mmio(dev, &s->iomem); @@ -523,7 +526,7 @@ static void zynq_slcr_class_init(ObjectClass *klass, = void *data) =20 static const TypeInfo zynq_slcr_info =3D { .class_init =3D zynq_slcr_class_init, - .name =3D "xilinx,zynq_slcr", + .name =3D TYPE_ZYNQ_SLCR, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(ZynqSLCRState), }; --=20 1.8.1.4