From nobody Sat Jul 12 15:38:13 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1486015275633149.9489247090894; Wed, 1 Feb 2017 22:01:15 -0800 (PST) Received: from localhost ([::1]:54454 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cZASH-0001vs-Mr for importer@patchew.org; Thu, 02 Feb 2017 01:01:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cZ9jv-0007UR-H1 for qemu-devel@nongnu.org; Thu, 02 Feb 2017 00:15:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cZ9jq-0003ro-VG for qemu-devel@nongnu.org; Thu, 02 Feb 2017 00:15:23 -0500 Received: from ozlabs.org ([103.22.144.67]:37659) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cZ9jq-0003oC-Fg; Thu, 02 Feb 2017 00:15:18 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3vDSqS1MC2z9s85; Thu, 2 Feb 2017 16:14:58 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1486012500; bh=Q9022MLYmGRQE4HPqrV8I/vymYLmCnwPArOIZY3Vkx8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JPzSDThcf+D6QmTfbBwQ71AJhDg3SHtVZAR1l+0ank4YJQY6OPbXO2EzZffg1UnF3 g9KFaCl2ToEtXyRjIHyxaG+BCzVgiGFL/YB/eRI1LSQH1j8GdCsEh3EBBzg1vBMnLH WgVMY4MlFxqYrtL6ELlKUnao07XH3dp8vv+5pUFw= From: David Gibson To: peter.maydell@linaro.org Date: Thu, 2 Feb 2017 16:13:40 +1100 Message-Id: <20170202051445.5735-43-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170202051445.5735-1-david@gibson.dropbear.id.au> References: <20170202051445.5735-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 042/107] hw/gpio: QOM'ify mpc8xxx.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, thuth@redhat.com, xiaoqiang zhao , qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com, agraf@suse.de, aik@ozlabs.ru, qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: xiaoqiang zhao * Drop the old SysBus init function and use instance_init * Change mpc8xxx_gpio_reset to a DeviceClass::reset function Signed-off-by: xiaoqiang zhao Signed-off-by: David Gibson --- hw/gpio/mpc8xxx.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/hw/gpio/mpc8xxx.c b/hw/gpio/mpc8xxx.c index d149719..e12edb4 100644 --- a/hw/gpio/mpc8xxx.c +++ b/hw/gpio/mpc8xxx.c @@ -143,8 +143,10 @@ static void mpc8xxx_gpio_write(void *opaque, hwaddr of= fset, mpc8xxx_gpio_update(s); } =20 -static void mpc8xxx_gpio_reset(MPC8XXXGPIOState *s) +static void mpc8xxx_gpio_reset(DeviceState *dev) { + MPC8XXXGPIOState *s =3D MPC8XXX_GPIO(dev); + s->dir =3D 0; s->odr =3D 0; s->dat =3D 0; @@ -180,33 +182,33 @@ static const MemoryRegionOps mpc8xxx_gpio_ops =3D { .endianness =3D DEVICE_BIG_ENDIAN, }; =20 -static int mpc8xxx_gpio_initfn(SysBusDevice *sbd) +static void mpc8xxx_gpio_initfn(Object *obj) { - DeviceState *dev =3D DEVICE(sbd); - MPC8XXXGPIOState *s =3D MPC8XXX_GPIO(dev); + DeviceState *dev =3D DEVICE(obj); + MPC8XXXGPIOState *s =3D MPC8XXX_GPIO(obj); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); =20 - memory_region_init_io(&s->iomem, OBJECT(s), &mpc8xxx_gpio_ops, s, "mpc= 8xxx_gpio", 0x1000); + memory_region_init_io(&s->iomem, obj, &mpc8xxx_gpio_ops, + s, "mpc8xxx_gpio", 0x1000); sysbus_init_mmio(sbd, &s->iomem); sysbus_init_irq(sbd, &s->irq); qdev_init_gpio_in(dev, mpc8xxx_gpio_set_irq, 32); qdev_init_gpio_out(dev, s->out, 32); - mpc8xxx_gpio_reset(s); - return 0; } =20 static void mpc8xxx_gpio_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D mpc8xxx_gpio_initfn; dc->vmsd =3D &vmstate_mpc8xxx_gpio; + dc->reset =3D mpc8xxx_gpio_reset; } =20 static const TypeInfo mpc8xxx_gpio_info =3D { .name =3D TYPE_MPC8XXX_GPIO, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(MPC8XXXGPIOState), + .instance_init =3D mpc8xxx_gpio_initfn, .class_init =3D mpc8xxx_gpio_class_init, }; =20 --=20 2.9.3