Received: from eggs.gnu.org ([2001:4830:134:3::10]:34035) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ut6he-0003cu-LU for qemu-devel@nongnu.org; Sat, 29 Jun 2013 21:45:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ut6hY-0007dn-Ik for qemu-devel@nongnu.org; Sat, 29 Jun 2013 21:45:22 -0400 From: Alexander Graf Date: Sun, 30 Jun 2013 03:44:51 +0200 Message-Id: <1372556709-23868-15-git-send-email-agraf@suse.de> In-Reply-To: <1372556709-23868-1-git-send-email-agraf@suse.de> References: <1372556709-23868-1-git-send-email-agraf@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 14/32] mpc8544_guts: Turn qdev initfn into instance_init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-ppc@nongnu.org Cc: Blue Swirl , qemu-devel@nongnu.org, Aurelien Jarno , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Andreas F=C3=A4rber SysBus can deal with NULL SysBusDeviceClass::init since 4ce5dae. Signed-off-by: Andreas F=C3=A4rber Signed-off-by: Alexander Graf --- hw/ppc/mpc8544_guts.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c index f623b04..d41f615 100644 --- a/hw/ppc/mpc8544_guts.c +++ b/hw/ppc/mpc8544_guts.c @@ -114,29 +114,21 @@ static const MemoryRegionOps mpc8544_guts_ops =3D { }, }; =20 -static int mpc8544_guts_initfn(SysBusDevice *dev) +static void mpc8544_guts_initfn(Object *obj) { - GutsState *s =3D MPC8544_GUTS(dev); + SysBusDevice *d =3D SYS_BUS_DEVICE(obj); + GutsState *s =3D MPC8544_GUTS(obj); =20 memory_region_init_io(&s->iomem, &mpc8544_guts_ops, s, "mpc8544.guts", MPC8544_GUTS_MMIO_SIZE); - sysbus_init_mmio(dev, &s->iomem); - - return 0; -} - -static void mpc8544_guts_class_init(ObjectClass *klass, void *data) -{ - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); - - k->init =3D mpc8544_guts_initfn; + sysbus_init_mmio(d, &s->iomem); } =20 static const TypeInfo mpc8544_guts_info =3D { .name =3D TYPE_MPC8544_GUTS, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(GutsState), - .class_init =3D mpc8544_guts_class_init, + .instance_init =3D mpc8544_guts_initfn, }; =20 static void mpc8544_guts_register_types(void) --=20 1.8.1.4