From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2jW7-0007uO-E7 for qemu-devel@nongnu.org; Fri, 26 Jul 2013 11:01:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2jW2-00010x-6n for qemu-devel@nongnu.org; Fri, 26 Jul 2013 11:01:15 -0400 Received: from cantor2.suse.de ([195.135.220.15]:33417 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2jW2-00010U-0y for qemu-devel@nongnu.org; Fri, 26 Jul 2013 11:01:10 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 26 Jul 2013 17:01:00 +0200 Message-Id: <1374850864-7331-4-git-send-email-afaerber@suse.de> In-Reply-To: <1374850864-7331-1-git-send-email-afaerber@suse.de> References: <1374850864-7331-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 3/6] puv3_dma: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Guan Xuetao , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/dma/puv3_dma.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/dma/puv3_dma.c b/hw/dma/puv3_dma.c index 36004ae..101bd7f 100644 --- a/hw/dma/puv3_dma.c +++ b/hw/dma/puv3_dma.c @@ -18,8 +18,12 @@ #define PUV3_DMA_CH_MASK (0xff) #define PUV3_DMA_CH(offset) ((offset) >> 8) =20 -typedef struct { - SysBusDevice busdev; +#define TYPE_PUV3_DMA "puv3_dma" +#define PUV3_DMA(obj) OBJECT_CHECK(PUV3DMAState, (obj), TYPE_PUV3_DMA) + +typedef struct PUV3DMAState { + SysBusDevice parent_obj; + MemoryRegion iomem; uint32_t reg_CFG[PUV3_DMA_CH_NR]; } PUV3DMAState; @@ -73,7 +77,7 @@ static const MemoryRegionOps puv3_dma_ops =3D { =20 static int puv3_dma_init(SysBusDevice *dev) { - PUV3DMAState *s =3D FROM_SYSBUS(PUV3DMAState, dev); + PUV3DMAState *s =3D PUV3_DMA(dev); int i; =20 for (i =3D 0; i < PUV3_DMA_CH_NR; i++) { @@ -95,7 +99,7 @@ static void puv3_dma_class_init(ObjectClass *klass, voi= d *data) } =20 static const TypeInfo puv3_dma_info =3D { - .name =3D "puv3_dma", + .name =3D TYPE_PUV3_DMA, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PUV3DMAState), .class_init =3D puv3_dma_class_init, --=20 1.8.1.4