From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t07-00026s-9M for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t00-0002Ci-Un for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:20:59 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53231 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t00-0002CX-O5 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:20:52 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:17:54 +0200 Message-Id: <1375125630-24869-18-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 017/173] audio/marvell_88w8618: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Vassili Karpov (malc)" , =?UTF-8?q?Andreas=20F=C3=A4rber?= Introduce a type constant, use QOM casts and rename the parent field. Reviewed-by: Hu Tao Signed-off-by: Andreas F=C3=A4rber --- hw/audio/marvell_88w8618.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c index b40ea43..97194ce 100644 --- a/hw/audio/marvell_88w8618.c +++ b/hw/audio/marvell_88w8618.c @@ -36,8 +36,13 @@ #define MP_AUDIO_CLOCK_24MHZ (1 << 9) #define MP_AUDIO_MONO (1 << 14) =20 +#define TYPE_MV88W8618_AUDIO "mv88w8618_audio" +#define MV88W8618_AUDIO(obj) \ + OBJECT_CHECK(mv88w8618_audio_state, (obj), TYPE_MV88W8618_AUDIO) + typedef struct mv88w8618_audio_state { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; qemu_irq irq; uint32_t playback_mode; @@ -219,8 +224,7 @@ static void mv88w8618_audio_write(void *opaque, hwadd= r offset, =20 static void mv88w8618_audio_reset(DeviceState *d) { - mv88w8618_audio_state *s =3D FROM_SYSBUS(mv88w8618_audio_state, - SYS_BUS_DEVICE(d)); + mv88w8618_audio_state *s =3D MV88W8618_AUDIO(d); =20 s->playback_mode =3D 0; s->status =3D 0; @@ -238,7 +242,7 @@ static const MemoryRegionOps mv88w8618_audio_ops =3D = { =20 static int mv88w8618_audio_init(SysBusDevice *dev) { - mv88w8618_audio_state *s =3D FROM_SYSBUS(mv88w8618_audio_state, dev)= ; + mv88w8618_audio_state *s =3D MV88W8618_AUDIO(dev); =20 sysbus_init_irq(dev, &s->irq); =20 @@ -287,7 +291,7 @@ static void mv88w8618_audio_class_init(ObjectClass *k= lass, void *data) } =20 static const TypeInfo mv88w8618_audio_info =3D { - .name =3D "mv88w8618_audio", + .name =3D TYPE_MV88W8618_AUDIO, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(mv88w8618_audio_state), .class_init =3D mv88w8618_audio_class_init, --=20 1.8.1.4