From nobody Wed Nov 12 11:54:55 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1570184955; cv=none; d=zoho.com; s=zohoarc; b=TLAxmGb1ycSivpwAdeU4cOWaJR+2rVCM4yE6DHQ09yYAslUlrQw3WApOAh7p1R7n2aMrBINoieVocR8vp1YtBEDWhtCg1sPPayv6PbyV4tvKqMIsgL67M23e99QoLsa7FfKVe0/7urrmWM1ogUenhWHlFQOZZqvDh2UlKSnbTmM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570184955; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Nr5rIFLpfKI/iMEXXCgi8RxJ+kqGyQp//gF2jaRRB00=; b=B2DhNhs5DJOgwMoEIPe8zOuIY8ca+J9ThNb8JG4sQlqZFaEfMgokGTzj+h1Bb1L+lnASzNABj0oUQk6oJJ104Zqzo0pjm+S/w9/7McZ9nZyr9iem1adfHOPxUN2rvdSu9GD5bUl2M2GAwKdH6C1fdIiwkHzE3evZgXpYWAKSi1s= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570184955961880.1241345396795; Fri, 4 Oct 2019 03:29:15 -0700 (PDT) Received: from localhost ([::1]:45594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGKph-0000AF-78 for importer@patchew.org; Fri, 04 Oct 2019 06:29:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53266) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGK3B-0005nw-HJ for qemu-devel@nongnu.org; Fri, 04 Oct 2019 05:39:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iGK37-00063K-TY for qemu-devel@nongnu.org; Fri, 04 Oct 2019 05:39:00 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:51165 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iGK37-0005Za-Hz; Fri, 04 Oct 2019 05:38:57 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 46l4YP69Llz9sSP; Fri, 4 Oct 2019 19:38:01 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1570181881; bh=94tk8hMC8mG/3jJCPrWVw2Ex0NCpGjmPmqMYz3vP9bY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VThTlx65/zMIL788WsYOhiL5mgCSPY9rWh3HaIUFeoIziOInMmeDHlfhiWRXlZa33 Qee/ye2wWbseM4ftaDelZ95QhKZ00jXd0L6jww+vJ7fh7MQV2GiaKS1Zpsv572gJTS 1EALQwZvVqBc75CHDoPvah9rFLhGYvwiaMsSVfjk= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 39/53] spapr: Fold spapr_phb_lsi_qirq() into its single caller Date: Fri, 4 Oct 2019 19:37:33 +1000 Message-Id: <20191004093747.31350-40-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191004093747.31350-1-david@gibson.dropbear.id.au> References: <20191004093747.31350-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 203.11.71.1 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, aik@ozlabs.ru, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" No point having a two-line helper that's used exactly once, and not likely to be used anywhere else in future. Signed-off-by: David Gibson Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Greg Kurz Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/spapr_pci.c | 3 ++- include/hw/pci-host/spapr.h | 7 ------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index c1c9634755..01ff41d4c4 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -721,9 +721,10 @@ static void pci_spapr_set_irq(void *opaque, int irq_nu= m, int level) * corresponding qemu_irq. */ SpaprPhbState *phb =3D opaque; + SpaprMachineState *spapr =3D SPAPR_MACHINE(qdev_get_machine()); =20 trace_spapr_pci_lsi_set(phb->dtbusname, irq_num, phb->lsi_table[irq_nu= m].irq); - qemu_set_irq(spapr_phb_lsi_qirq(phb, irq_num), level); + qemu_set_irq(spapr_qirq(spapr, phb->lsi_table[irq_num].irq), level); } =20 static PCIINTxRoute spapr_route_intx_pin_to_irq(void *opaque, int pin) diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h index abd87605b2..23506f05d9 100644 --- a/include/hw/pci-host/spapr.h +++ b/include/hw/pci-host/spapr.h @@ -128,13 +128,6 @@ struct SpaprPhbState { #define SPAPR_PCI_NV2ATSD_WIN_SIZE (NVGPU_MAX_NUM * NVGPU_MAX_LINKS * \ 64 * KiB) =20 -static inline qemu_irq spapr_phb_lsi_qirq(struct SpaprPhbState *phb, int p= in) -{ - SpaprMachineState *spapr =3D SPAPR_MACHINE(qdev_get_machine()); - - return spapr_qirq(spapr, phb->lsi_table[pin].irq); -} - int spapr_dt_phb(SpaprPhbState *phb, uint32_t intc_phandle, void *fdt, uint32_t nr_msis, int *node_offset); =20 --=20 2.21.0