From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57591) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t23-0005E6-BS for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:23:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1q-0002vr-Qs for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:59 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53541 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1q-0002vl-JI for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:46 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 2B668A52BF for ; Mon, 29 Jul 2013 21:22:46 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:20:11 +0200 Message-Id: <1375125630-24869-155-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 154/173] lm32_timer: 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/timer/lm32_timer.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/timer/lm32_timer.c b/hw/timer/lm32_timer.c index 016dade..986e6a1 100644 --- a/hw/timer/lm32_timer.c +++ b/hw/timer/lm32_timer.c @@ -50,8 +50,12 @@ enum { CR_STOP =3D (1 << 3), }; =20 +#define TYPE_LM32_TIMER "lm32-timer" +#define LM32_TIMER(obj) OBJECT_CHECK(LM32TimerState, (obj), TYPE_LM32_TI= MER) + struct LM32TimerState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; =20 QEMUBH *bh; @@ -161,7 +165,7 @@ static void timer_hit(void *opaque) =20 static void timer_reset(DeviceState *d) { - LM32TimerState *s =3D container_of(d, LM32TimerState, busdev.qdev); + LM32TimerState *s =3D LM32_TIMER(d); int i; =20 for (i =3D 0; i < R_MAX; i++) { @@ -172,7 +176,7 @@ static void timer_reset(DeviceState *d) =20 static int lm32_timer_init(SysBusDevice *dev) { - LM32TimerState *s =3D FROM_SYSBUS(typeof(*s), dev); + LM32TimerState *s =3D LM32_TIMER(dev); =20 sysbus_init_irq(dev, &s->irq); =20 @@ -217,7 +221,7 @@ static void lm32_timer_class_init(ObjectClass *klass,= void *data) } =20 static const TypeInfo lm32_timer_info =3D { - .name =3D "lm32-timer", + .name =3D TYPE_LM32_TIMER, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(LM32TimerState), .class_init =3D lm32_timer_class_init, --=20 1.8.1.4