Message ID | 20240702114302.22475-12-kabel@kernel.org (mailing list archive) |
---|---|
State | Superseded |
Headers | show
Return-Path: <linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AE54AC3064D for <linux-arm-kernel@archiver.kernel.org>; Tue, 2 Jul 2024 11:45:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc: To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=oEpD9IU+39RZRznSBk9U3bnJ+DIHudv0Ymxmqynx158=; b=k+QttPIJqbsdW5gQ/zfb/Ed7NP HwDlVDk5k55NCP7THlFfe5cZ68w/kFd5Jt2PtzEvuNXu9tBx7CxEIsZbpk/7JheTsBFmoeAKYsoMx XmsMyin9hFHxLE6v/TiID8uda+ii8fUYwxY8wKpSwn9RMQCeprGyvRLI5ZV5ZtITuZpfwTaCgjajs aX/IA/66Cm0afgBw4AWUWwqpN9cx3nzZncKeC1YK1VoB90Nswmm5C8mruN0PJPbWltUXVrHlgOU6B AGg+ACLTbQE8oWQU+6EQUePtOZZKZFk4yEzMBGIP6cSyKIADATV4IiDMMMi1i8gJGOIYZfzTP9FQ1 gAVd92gg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sObwf-00000006X8T-2Izd; Tue, 02 Jul 2024 11:45:13 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sObv9-00000006WC9-0fqD for linux-arm-kernel@lists.infradead.org; Tue, 02 Jul 2024 11:43:40 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 7DF8FCE1D5E; Tue, 2 Jul 2024 11:43:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3BDFC32781; Tue, 2 Jul 2024 11:43:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719920616; bh=qXMMpJe7Tt46catG2ods+Qy+liP4yFnsD4G4zPi31aI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pI/qzFQnapjgUwPflFrCDK0YNPJRNDckpOYNFYA5YfwSfySgu5/sgqKkVgDxTBP/F y4fvQrArJy0ETbdsAtTUeH2xO6VtxWidI0WeALIG6N9EEXZ+2j7ftYjDcPGiXZ9l7G WM9JrxqKqoqMAP8YmLvgQ91P8h4zKDDQPht2ZJXwgW1SsDVNeqs/JN6hwhNcBiipbw RCY3KaDwIXI44a0P2VY5QmqxB1KVca6t6TrVcFiratFiokfEaRrLy5IVkH4ECJtB4G iSdm9G02tElvDmIlaW1WeVcxWV/EGrqRa7eadb9ITyThJnugMQaBpbgZMqLBTWuFgi KwqCrKw1IOw4Q== From: =?utf-8?q?Marek_Beh=C3=BAn?= <kabel@kernel.org> To: Andrew Lunn <andrew@lunn.ch>, Gregory Clement <gregory.clement@bootlin.com>, Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>, Thomas Gleixner <tglx@linutronix.de>, linux-arm-kernel@lists.infradead.org, arm@kernel.org, Andy Shevchenko <andy@kernel.org>, Hans de Goede <hdegoede@redhat.com>, =?utf-8?q?Ilpo_J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com> Cc: =?utf-8?q?Marek_Beh=C3=BAn?= <kabel@kernel.org> Subject: [PATCH v2 11/30] irqchip/armada-370-xp: Rename variable for consistency Date: Tue, 2 Jul 2024 13:42:43 +0200 Message-ID: <20240702114302.22475-12-kabel@kernel.org> X-Mailer: git-send-email 2.44.2 In-Reply-To: <20240702114302.22475-1-kabel@kernel.org> References: <20240702114302.22475-1-kabel@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240702_044339_396712_BDA3BF55 X-CRM114-Status: GOOD ( 14.29 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org |
Series |
armada-370-xp irqchip updates round 2
|
expand
|
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index 22e1a493abae..7016b206bddd 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -462,14 +462,14 @@ static const struct irq_domain_ops ipi_domain_ops = { static void ipi_resume(void) { for (int i = 0; i < IPI_DOORBELL_END; i++) { - int irq; + int virq; - irq = irq_find_mapping(ipi_domain, i); - if (irq <= 0) + virq = irq_find_mapping(ipi_domain, i); + if (virq <= 0) continue; - if (irq_percpu_is_enabled(irq)) { + if (irq_percpu_is_enabled(virq)) { struct irq_data *d; - d = irq_domain_get_irq_data(ipi_domain, irq); + d = irq_domain_get_irq_data(ipi_domain, virq); armada_370_xp_ipi_unmask(d); } }
Rename the irq variable to virq in the ipi_resume() function for consistency with the rest of the code. Signed-off-by: Marek BehĂșn <kabel@kernel.org> --- drivers/irqchip/irq-armada-370-xp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)