Skip to content

Commit 35d0086

Browse files
author
Linus Walleij
committed
pinctrl: plgpio: Convert to immutable irq_chip
Convert the driver to immutable irq-chip with a bit of intuition. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Link: https://lore.kernel.org/r/20230414-immutable-irqchips-2-v1-3-6b59a5186b00@linaro.org
1 parent 33c56e5 commit 35d0086

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

drivers/pinctrl/spear/pinctrl-plgpio.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@ static void plgpio_irq_disable(struct irq_data *d)
301301
spin_lock_irqsave(&plgpio->lock, flags);
302302
plgpio_reg_set(plgpio->regmap, offset, plgpio->regs.ie);
303303
spin_unlock_irqrestore(&plgpio->lock, flags);
304+
gpiochip_disable_irq(gc, irqd_to_hwirq(d));
304305
}
305306

306307
static void plgpio_irq_enable(struct irq_data *d)
@@ -317,6 +318,7 @@ static void plgpio_irq_enable(struct irq_data *d)
317318
return;
318319
}
319320

321+
gpiochip_enable_irq(gc, irqd_to_hwirq(d));
320322
spin_lock_irqsave(&plgpio->lock, flags);
321323
plgpio_reg_reset(plgpio->regmap, offset, plgpio->regs.ie);
322324
spin_unlock_irqrestore(&plgpio->lock, flags);
@@ -356,11 +358,13 @@ static int plgpio_irq_set_type(struct irq_data *d, unsigned trigger)
356358
return 0;
357359
}
358360

359-
static struct irq_chip plgpio_irqchip = {
361+
static const struct irq_chip plgpio_irqchip = {
360362
.name = "PLGPIO",
361363
.irq_enable = plgpio_irq_enable,
362364
.irq_disable = plgpio_irq_disable,
363365
.irq_set_type = plgpio_irq_set_type,
366+
.flags = IRQCHIP_IMMUTABLE,
367+
GPIOCHIP_IRQ_RESOURCE_HELPERS,
364368
};
365369

366370
static void plgpio_irq_handler(struct irq_desc *desc)
@@ -595,7 +599,7 @@ static int plgpio_probe(struct platform_device *pdev)
595599
struct gpio_irq_chip *girq;
596600

597601
girq = &plgpio->chip.irq;
598-
girq->chip = &plgpio_irqchip;
602+
gpio_irq_chip_set_chip(girq, &plgpio_irqchip);
599603
girq->parent_handler = plgpio_irq_handler;
600604
girq->num_parents = 1;
601605
girq->parents = devm_kcalloc(&pdev->dev, 1,

0 commit comments

Comments
 (0)