From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2jW5-0007sh-5n for qemu-devel@nongnu.org; Fri, 26 Jul 2013 11:01:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2jW1-00010Z-Vx for qemu-devel@nongnu.org; Fri, 26 Jul 2013 11:01:13 -0400 Received: from cantor2.suse.de ([195.135.220.15]:33414 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2jW1-00010O-Me for qemu-devel@nongnu.org; Fri, 26 Jul 2013 11:01:09 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 2E83FA51FE for ; Fri, 26 Jul 2013 17:01:09 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 26 Jul 2013 17:01:01 +0200 Message-Id: <1374850864-7331-5-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 4/6] pxa2xx_dma: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/dma/pxa2xx_dma.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/hw/dma/pxa2xx_dma.c b/hw/dma/pxa2xx_dma.c index bc7bf4c..c013abb 100644 --- a/hw/dma/pxa2xx_dma.c +++ b/hw/dma/pxa2xx_dma.c @@ -26,8 +26,12 @@ typedef struct { int request; } PXA2xxDMAChannel; =20 +#define TYPE_PXA2XX_DMA "pxa2xx-dma" +#define PXA2XX_DMA(obj) OBJECT_CHECK(PXA2xxDMAState, (obj), TYPE_PXA2XX_= DMA) + typedef struct PXA2xxDMAState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; qemu_irq irq; =20 @@ -445,11 +449,11 @@ static void pxa2xx_dma_request(void *opaque, int re= q_num, int on) } } =20 -static int pxa2xx_dma_init(SysBusDevice *dev) +static int pxa2xx_dma_init(SysBusDevice *sbd) { + DeviceState *dev =3D DEVICE(sbd); + PXA2xxDMAState *s =3D PXA2XX_DMA(dev); int i; - PXA2xxDMAState *s; - s =3D FROM_SYSBUS(PXA2xxDMAState, dev); =20 if (s->channels <=3D 0) { return -1; @@ -463,12 +467,12 @@ static int pxa2xx_dma_init(SysBusDevice *dev) =20 memset(s->req, 0, sizeof(uint8_t) * PXA2XX_DMA_NUM_REQUESTS); =20 - qdev_init_gpio_in(&dev->qdev, pxa2xx_dma_request, PXA2XX_DMA_NUM_REQ= UESTS); + qdev_init_gpio_in(dev, pxa2xx_dma_request, PXA2XX_DMA_NUM_REQUESTS); =20 memory_region_init_io(&s->iomem, OBJECT(s), &pxa2xx_dma_ops, s, "pxa2xx.dma", 0x00010000); - sysbus_init_mmio(dev, &s->iomem); - sysbus_init_irq(dev, &s->irq); + sysbus_init_mmio(sbd, &s->iomem); + sysbus_init_irq(sbd, &s->irq); =20 return 0; } @@ -560,7 +564,7 @@ static void pxa2xx_dma_class_init(ObjectClass *klass,= void *data) } =20 static const TypeInfo pxa2xx_dma_info =3D { - .name =3D "pxa2xx-dma", + .name =3D TYPE_PXA2XX_DMA, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PXA2xxDMAState), .class_init =3D pxa2xx_dma_class_init, --=20 1.8.1.4