]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
irqchip/renesas-rzg2l: Rename rzg2l_tint_eoi()
authorBiju Das <biju.das.jz@bp.renesas.com>
Tue, 5 Mar 2024 18:39:19 +0000 (18:39 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Apr 2024 13:11:44 +0000 (15:11 +0200)
[ 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 <biju.das.jz@bp.renesas.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Stable-dep-of: 853a6030303f ("irqchip/renesas-rzg2l: Prevent spurious interrupts when setting trigger type")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/irqchip/irq-renesas-rzg2l.c

index 3f2f4ebfe4da6123eb106567bb748fe58ff13741..51dda1745ffaa58e04fef848641f72258c868b53 100644 (file)
@@ -90,11 +90,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);
@@ -117,7 +115,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);
 }