From nobody Tue Feb 10 22:56:39 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1658171196433231.4337287081206; Mon, 18 Jul 2022 12:06:36 -0700 (PDT) Received: from localhost ([::1]:59470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDW4h-0004UQ-BP for importer@patchew.org; Mon, 18 Jul 2022 15:06:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60820) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDVZy-0000LJ-AX for qemu-devel@nongnu.org; Mon, 18 Jul 2022 14:34:50 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:49108) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDVZw-0005c3-KP for qemu-devel@nongnu.org; Mon, 18 Jul 2022 14:34:49 -0400 Received: from [2a00:23c4:8ba6:5100:d563:eb67:74b1:7b0] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oDVYb-000B51-7Y; Mon, 18 Jul 2022 19:33:29 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To: Cc:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=qxOcmSANThumGj40TwGSkei51BcO8jmxMxw+/VmWAhY=; b=UG9Wo2o6qTpsqvRI+4+NicOMEF 5Bxhg8lThAd6T1n2thZ3BmFHmTbW20IEySNM9sFDKnoI8lGdGN5gNUo8eXWaV5JuOq2bPa10CQ1Rr 4/+XpJZJtoEAYyyGwR418U3pXEQLEIotmFv6OCgGRJNGPHYMYrV1v9+ZeCjSIbSi94mzTWOl7Tz08 NcPhU8kiPoa4vGdoCl+irdq26dWM5xr/zwXwO4etR2GQGZ3sK4lC5I6rtBFyecsz7NJE/o3wLgYen J2IqoN1Qq/rumpu/sSrpWqY0I9c5lHJR+JarxVCu/UqWbT1ufYEADHzKEgUz3XgGXcb5xQAGDzxMR 8cR3NyeOVBncrv/GMS21lG22eHlmIIHzH101XKgqGyw00UGg5BRdaB0HTiXUkBh1fepPsP4aheidN QpYl9XCg5jQRy7Q9mpXzzQ1X7rYrpVxy4KlqjA9wVQHf9JGblCfsK5JibygNKTLHEMyLfVMHTGz8e 94VqtJDYajildD/gTH5ZyfhWGTXGFyIfCa3b5aAyzz7SN3QR6NvRdclVzyowpmgnSV/tU/A+kQeaz ysKXozygfxF36hRpGfZAJh+vGAy6vUr5mqe3yHN1tN/n9FP592IS4w1DOR16qzu0xAyDu90LhoL1i fh2qnWzR4oMzfdlKqJK4NbJJdgsDu6bTnAwRy04ws=; From: Mark Cave-Ayland To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Mon, 18 Jul 2022 19:33:13 +0100 Message-Id: <20220718183339.124253-15-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220718183339.124253-1-mark.cave-ayland@ilande.co.uk> References: <20220718183339.124253-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba6:5100:d563:eb67:74b1:7b0 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PULL 14/40] lasips2: remove legacy lasips2_initfn() function X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1658171198228100001 There is only one user of the legacy lasips2_initfn() function which is in machine_hppa_init(), so inline its functionality into machine_hppa_init() a= nd then remove it. Signed-off-by: Mark Cave-Ayland Tested-by: Helge Deller Acked-by: Helge Deller Reviewed-by: Peter Maydell Message-Id: <20220712215251.7944-15-mark.cave-ayland@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/hppa/machine.c | 6 ++++-- hw/input/lasips2.c | 12 ------------ include/hw/input/lasips2.h | 2 -- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 6080037cf1..e53d5f0fa7 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -280,8 +280,10 @@ static void machine_hppa_init(MachineState *machine) } =20 /* PS/2 Keyboard/Mouse */ - dev =3D DEVICE(lasips2_initfn(qdev_get_gpio_in(lasi_dev, - LASI_IRQ_PS2KBD_HPA))); + dev =3D qdev_new(TYPE_LASIPS2); + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, + qdev_get_gpio_in(lasi_dev, LASI_IRQ_PS2KBD_HPA)); memory_region_add_subregion(addr_space, LASI_PS2KBD_HPA, sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0)); diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c index 40f77baf3e..48237816a3 100644 --- a/hw/input/lasips2.c +++ b/hw/input/lasips2.c @@ -255,18 +255,6 @@ static void lasips2_set_mouse_irq(void *opaque, int n,= int level) lasips2_update_irq(port->parent); } =20 -LASIPS2State *lasips2_initfn(qemu_irq irq) -{ - DeviceState *dev; - - dev =3D qdev_new(TYPE_LASIPS2); - sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); - - sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq); - - return LASIPS2(dev); -} - static void lasips2_realize(DeviceState *dev, Error **errp) { LASIPS2State *s =3D LASIPS2(dev); diff --git a/include/hw/input/lasips2.h b/include/hw/input/lasips2.h index f051c970f0..868c5521d7 100644 --- a/include/hw/input/lasips2.h +++ b/include/hw/input/lasips2.h @@ -47,6 +47,4 @@ struct LASIPS2State { #define TYPE_LASIPS2 "lasips2" OBJECT_DECLARE_SIMPLE_TYPE(LASIPS2State, LASIPS2) =20 -LASIPS2State *lasips2_initfn(qemu_irq irq); - #endif /* HW_INPUT_LASIPS2_H */ --=20 2.30.2