From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56409) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0q-0003ZC-78 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0k-0002Tk-6J for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:44 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53375 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0j-0002Td-Tk for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:38 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:42 +0200 Message-Id: <1375125630-24869-66-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 065/173] imx_serial: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Chubb , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/char/imx_serial.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c index 5c17eaa..7f16835 100644 --- a/hw/char/imx_serial.c +++ b/hw/char/imx_serial.c @@ -43,8 +43,12 @@ do { printf("imx_serial: " fmt , ##args); } while (0) # define IPRINTF(fmt, args...) do {} while (0) #endif =20 -typedef struct { - SysBusDevice busdev; +#define TYPE_IMX_SERIAL "imx-serial" +#define IMX_SERIAL(obj) OBJECT_CHECK(IMXSerialState, (obj), TYPE_IMX_SER= IAL) + +typedef struct IMXSerialState { + SysBusDevice parent_obj; + MemoryRegion iomem; int32_t readbuff; =20 @@ -169,7 +173,7 @@ static void imx_serial_reset(IMXSerialState *s) =20 static void imx_serial_reset_at_boot(DeviceState *dev) { - IMXSerialState *s =3D container_of(dev, IMXSerialState, busdev.qdev)= ; + IMXSerialState *s =3D IMX_SERIAL(dev); =20 imx_serial_reset(s); =20 @@ -383,7 +387,7 @@ static const struct MemoryRegionOps imx_serial_ops =3D= { =20 static int imx_serial_init(SysBusDevice *dev) { - IMXSerialState *s =3D FROM_SYSBUS(IMXSerialState, dev); + IMXSerialState *s =3D IMX_SERIAL(dev); =20 =20 memory_region_init_io(&s->iomem, OBJECT(s), &imx_serial_ops, s, @@ -410,7 +414,7 @@ void imx_serial_create(int uart, const hwaddr addr, q= emu_irq irq) const char chr_name[] =3D "serial"; char label[ARRAY_SIZE(chr_name) + 1]; =20 - dev =3D qdev_create(NULL, "imx-serial"); + dev =3D qdev_create(NULL, TYPE_IMX_SERIAL); =20 if (uart >=3D MAX_SERIAL_PORTS) { hw_error("Cannot assign uart %d: QEMU supports only %d ports\n", @@ -455,7 +459,7 @@ static void imx_serial_class_init(ObjectClass *klass,= void *data) } =20 static const TypeInfo imx_serial_info =3D { - .name =3D "imx-serial", + .name =3D TYPE_IMX_SERIAL, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(IMXSerialState), .class_init =3D imx_serial_class_init, --=20 1.8.1.4