Skip to content

Commit 73989a3

Browse files
committed
ARM: orion/gpio:: Convert generic irqchip locking to guard()
Conversion was done with Coccinelle. No functional change. Signed-off-by: Thomas Gleixner <[email protected]> Reviewed-by: Linus Walleij <[email protected]> Link: https://lore.kernel.org/all/[email protected]
1 parent b54bd5a commit 73989a3

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

arch/arm/plat-orion/gpio.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -496,11 +496,10 @@ static void orion_gpio_unmask_irq(struct irq_data *d)
496496
u32 reg_val;
497497
u32 mask = d->mask;
498498

499-
irq_gc_lock(gc);
499+
guard(raw_spinlock)(&gc->lock);
500500
reg_val = irq_reg_readl(gc, ct->regs.mask);
501501
reg_val |= mask;
502502
irq_reg_writel(gc, reg_val, ct->regs.mask);
503-
irq_gc_unlock(gc);
504503
}
505504

506505
static void orion_gpio_mask_irq(struct irq_data *d)
@@ -510,11 +509,10 @@ static void orion_gpio_mask_irq(struct irq_data *d)
510509
u32 mask = d->mask;
511510
u32 reg_val;
512511

513-
irq_gc_lock(gc);
512+
guard(raw_spinlock)(&gc->lock);
514513
reg_val = irq_reg_readl(gc, ct->regs.mask);
515514
reg_val &= ~mask;
516515
irq_reg_writel(gc, reg_val, ct->regs.mask);
517-
irq_gc_unlock(gc);
518516
}
519517

520518
void __init orion_gpio_init(int gpio_base, int ngpio,

0 commit comments

Comments
 (0)