]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ARM: orion/gpio:: Convert generic irqchip locking to guard()
authorThomas Gleixner <tglx@linutronix.de>
Thu, 13 Mar 2025 14:31:23 +0000 (15:31 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 7 Apr 2025 07:43:20 +0000 (09:43 +0200)
Conversion was done with Coccinelle. No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/all/20250313142524.200515896@linutronix.de
arch/arm/plat-orion/gpio.c

index 595e9cb33c1d2df0d43dfe8fbbdfe307e41b62b9..47d411d80a94dbe1c28f7eb5c7ebf111827ba333 100644 (file)
@@ -496,11 +496,10 @@ static void orion_gpio_unmask_irq(struct irq_data *d)
        u32 reg_val;
        u32 mask = d->mask;
 
-       irq_gc_lock(gc);
+       guard(raw_spinlock)(&gc->lock);
        reg_val = irq_reg_readl(gc, ct->regs.mask);
        reg_val |= mask;
        irq_reg_writel(gc, reg_val, ct->regs.mask);
-       irq_gc_unlock(gc);
 }
 
 static void orion_gpio_mask_irq(struct irq_data *d)
@@ -510,11 +509,10 @@ static void orion_gpio_mask_irq(struct irq_data *d)
        u32 mask = d->mask;
        u32 reg_val;
 
-       irq_gc_lock(gc);
+       guard(raw_spinlock)(&gc->lock);
        reg_val = irq_reg_readl(gc, ct->regs.mask);
        reg_val &= ~mask;
        irq_reg_writel(gc, reg_val, ct->regs.mask);
-       irq_gc_unlock(gc);
 }
 
 void __init orion_gpio_init(int gpio_base, int ngpio,