From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56827) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1G-0004OK-Tx for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t17-0002dy-0V for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:10 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53432 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t16-0002dn-MB for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:00 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:12 +0200 Message-Id: <1375125630-24869-96-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 095/173] exynos4210_gic: QOM cast cleanup for exynos4210.irq_gate List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Maksim Kozlov , Igor Mitsyanko , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Evgeny Voevodin , Dmitry Solodkiy Signed-off-by: Andreas F=C3=A4rber --- hw/intc/exynos4210_gic.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c index f9afb97..5b913f7 100644 --- a/hw/intc/exynos4210_gic.c +++ b/hw/intc/exynos4210_gic.c @@ -372,8 +372,13 @@ type_init(exynos4210_gic_register_types) * output sysbus IRQ line. The output IRQ level is formed as OR between = all * gpio inputs. */ -typedef struct { - SysBusDevice busdev; + +#define TYPE_EXYNOS4210_IRQ_GATE "exynos4210.irq_gate" +#define EXYNOS4210_IRQ_GATE(obj) \ + OBJECT_CHECK(Exynos4210IRQGateState, (obj), TYPE_EXYNOS4210_IRQ_GATE= ) + +typedef struct Exynos4210IRQGateState { + SysBusDevice parent_obj; =20 uint32_t n_in; /* inputs amount */ uint32_t *level; /* input levels */ @@ -418,8 +423,7 @@ static void exynos4210_irq_gate_handler(void *opaque,= int irq, int level) =20 static void exynos4210_irq_gate_reset(DeviceState *d) { - Exynos4210IRQGateState *s =3D - DO_UPCAST(Exynos4210IRQGateState, busdev.qdev, d); + Exynos4210IRQGateState *s =3D EXYNOS4210_IRQ_GATE(d); =20 memset(s->level, 0, s->n_in * sizeof(*s->level)); } @@ -427,17 +431,18 @@ static void exynos4210_irq_gate_reset(DeviceState *= d) /* * IRQ Gate initialization. */ -static int exynos4210_irq_gate_init(SysBusDevice *dev) +static int exynos4210_irq_gate_init(SysBusDevice *sbd) { - Exynos4210IRQGateState *s =3D FROM_SYSBUS(Exynos4210IRQGateState, de= v); + DeviceState *dev =3D DEVICE(sbd); + Exynos4210IRQGateState *s =3D EXYNOS4210_IRQ_GATE(dev); =20 /* Allocate general purpose input signals and connect a handler to e= ach of * them */ - qdev_init_gpio_in(&s->busdev.qdev, exynos4210_irq_gate_handler, s->n= _in); + qdev_init_gpio_in(dev, exynos4210_irq_gate_handler, s->n_in); =20 s->level =3D g_malloc0(s->n_in * sizeof(*s->level)); =20 - sysbus_init_irq(dev, &s->out); + sysbus_init_irq(sbd, &s->out); =20 return 0; } @@ -454,7 +459,7 @@ static void exynos4210_irq_gate_class_init(ObjectClas= s *klass, void *data) } =20 static const TypeInfo exynos4210_irq_gate_info =3D { - .name =3D "exynos4210.irq_gate", + .name =3D TYPE_EXYNOS4210_IRQ_GATE, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(Exynos4210IRQGateState), .class_init =3D exynos4210_irq_gate_class_init, --=20 1.8.1.4