From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2pec-0004WI-0m for qemu-devel@nongnu.org; Fri, 26 Jul 2013 17:34:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2pea-0003qK-AU for qemu-devel@nongnu.org; Fri, 26 Jul 2013 17:34:25 -0400 Received: from cantor2.suse.de ([195.135.220.15]:46363 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2pea-0003q1-4K for qemu-devel@nongnu.org; Fri, 26 Jul 2013 17:34:24 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 26 Jul 2013 23:34:06 +0200 Message-Id: <1374874454-15549-7-git-send-email-afaerber@suse.de> In-Reply-To: <1374874454-15549-1-git-send-email-afaerber@suse.de> References: <1374874454-15549-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 06/14] imx_ccm: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Chubb , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/misc/imx_ccm.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/hw/misc/imx_ccm.c b/hw/misc/imx_ccm.c index 816d5e8..63e33a4 100644 --- a/hw/misc/imx_ccm.c +++ b/hw/misc/imx_ccm.c @@ -29,8 +29,12 @@ do { printf("imx_ccm: " fmt , ##args); } while (0) =20 static int imx_ccm_post_load(void *opaque, int version_id); =20 -typedef struct { - SysBusDevice busdev; +#define TYPE_IMX_CCM "imx_ccm" +#define IMX_CCM(obj) OBJECT_CHECK(IMXCCMState, (obj), TYPE_IMX_CCM) + +typedef struct IMXCCMState { + SysBusDevice parent_obj; + MemoryRegion iomem; =20 uint32_t ccmr; @@ -108,7 +112,7 @@ static const VMStateDescription vmstate_imx_ccm =3D { =20 uint32_t imx_clock_frequency(DeviceState *dev, IMXClk clock) { - IMXCCMState *s =3D container_of(dev, IMXCCMState, busdev.qdev); + IMXCCMState *s =3D IMX_CCM(dev); =20 switch (clock) { case NOCLK: @@ -178,7 +182,7 @@ static void update_clocks(IMXCCMState *s) =20 static void imx_ccm_reset(DeviceState *dev) { - IMXCCMState *s =3D container_of(dev, IMXCCMState, busdev.qdev); + IMXCCMState *s =3D IMX_CCM(dev); =20 s->ccmr =3D 0x074b0b7b; s->pdr0 =3D 0xff870b48; @@ -279,7 +283,7 @@ static const struct MemoryRegionOps imx_ccm_ops =3D { =20 static int imx_ccm_init(SysBusDevice *dev) { - IMXCCMState *s =3D FROM_SYSBUS(typeof(*s), dev); + IMXCCMState *s =3D IMX_CCM(dev); =20 memory_region_init_io(&s->iomem, OBJECT(dev), &imx_ccm_ops, s, "imx_ccm", 0x1000); @@ -308,7 +312,7 @@ static void imx_ccm_class_init(ObjectClass *klass, vo= id *data) } =20 static const TypeInfo imx_ccm_info =3D { - .name =3D "imx_ccm", + .name =3D TYPE_IMX_CCM, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(IMXCCMState), .class_init =3D imx_ccm_class_init, --=20 1.8.1.4