From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 57AB6383BA; Mon, 1 Apr 2024 16:04:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711987452; cv=none; b=rKg3JeppSy1r6Uy6q375qJMZsqj6QclwpyvUZW8aK7G1HoFPwiEnLaeSzSDBJUhrB5OMrvDcMDPO+aUH5qeGwQawBAfmZuG4Az1ljJFZ0ufsExx5WgShTmQOCqvpBZrViAXl0rU3u9Dgk9tTVS4YbsVzZb6sFfO2rdYCR1KoR/g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711987452; c=relaxed/simple; bh=bq5KeqWGAKiIEoWOj7ZjwT6S7SB9lTe6jOgibXGNHwk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tk/EGMiBY980qO09Mxx0kNqMowEbeviHkpFSgtg5+KO0O35Mi+aI1Zp80PSY5r7wZ9ZHUJbGmXxSSrcgiEDxlQz98xcJi1BnLxQOR6pnl/8KwQB2blGdMhtgEAliDm9JtF9NNGkANE2rZ9vL+7P2j8+0HnnBd5Gnbb9C9C9/uko= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0i5asVWr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="0i5asVWr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D61BDC433C7; Mon, 1 Apr 2024 16:04:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1711987452; bh=bq5KeqWGAKiIEoWOj7ZjwT6S7SB9lTe6jOgibXGNHwk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0i5asVWrOiBTaE3iP3OxyYUejEqrA0Wwi0MTzx/RgSayRnVPvOvaMr0RqWS3ldejE KRBXJ/17xBd2/6gngTtgwRJgLVgdO3SLtlFpbfWdDXm0jDeXM6E3ih/6uKpyeBwqof rG/39Z/+k09fxK0weVEc/izs+EpR8zIgv4mMbydU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Biju Das , Thomas Gleixner , Geert Uytterhoeven , Sasha Levin Subject: [PATCH 6.8 263/399] irqchip/renesas-rzg2l: Rename rzg2l_tint_eoi() Date: Mon, 1 Apr 2024 17:43:49 +0200 Message-ID: <20240401152557.038637223@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240401152549.131030308@linuxfoundation.org> References: <20240401152549.131030308@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.8-stable review patch. If anyone has any objections, please let me know. ------------------ From: Biju Das [ Upstream commit 7cb6362c63df233172eaecddaf9ce2ce2f769112 ] Rename rzg2l_tint_eoi()->rzg2l_clear_tint_int() and simplify the code by removing redundant priv and hw_irq local variables. Signed-off-by: Biju Das Signed-off-by: Thomas Gleixner Reviewed-by: Geert Uytterhoeven Stable-dep-of: 853a6030303f ("irqchip/renesas-rzg2l: Prevent spurious interrupts when setting trigger type") Signed-off-by: Sasha Levin --- drivers/irqchip/irq-renesas-rzg2l.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/irqchip/irq-renesas-rzg2l.c b/drivers/irqchip/irq-renesas-rzg2l.c index 5285bc817dd0c..599e0aba5cc00 100644 --- a/drivers/irqchip/irq-renesas-rzg2l.c +++ b/drivers/irqchip/irq-renesas-rzg2l.c @@ -109,11 +109,9 @@ static void rzg2l_irq_eoi(struct irq_data *d) } } -static void rzg2l_tint_eoi(struct irq_data *d) +static void rzg2l_clear_tint_int(struct rzg2l_irqc_priv *priv, unsigned int hwirq) { - unsigned int hw_irq = irqd_to_hwirq(d) - IRQC_TINT_START; - struct rzg2l_irqc_priv *priv = irq_data_to_priv(d); - u32 bit = BIT(hw_irq); + u32 bit = BIT(hwirq - IRQC_TINT_START); u32 reg; reg = readl_relaxed(priv->base + TSCR); @@ -136,7 +134,7 @@ static void rzg2l_irqc_eoi(struct irq_data *d) if (hw_irq >= IRQC_IRQ_START && hw_irq <= IRQC_IRQ_COUNT) rzg2l_irq_eoi(d); else if (hw_irq >= IRQC_TINT_START && hw_irq < IRQC_NUM_IRQ) - rzg2l_tint_eoi(d); + rzg2l_clear_tint_int(priv, hw_irq); raw_spin_unlock(&priv->lock); irq_chip_eoi_parent(d); } -- 2.43.0