Skip to content

Commit 19bcff7

Browse files
author
Linus Walleij
committed
pinctrl: qcom ssbi-gpio: 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-6-6b59a5186b00@linaro.org
1 parent 5e75e24 commit 19bcff7

1 file changed

Lines changed: 21 additions & 3 deletions

File tree

drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -652,12 +652,30 @@ static int pm8xxx_pin_populate(struct pm8xxx_gpio *pctrl,
652652
return 0;
653653
}
654654

655-
static struct irq_chip pm8xxx_irq_chip = {
655+
static void pm8xxx_irq_disable(struct irq_data *d)
656+
{
657+
struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
658+
659+
gpiochip_disable_irq(gc, irqd_to_hwirq(d));
660+
}
661+
662+
static void pm8xxx_irq_enable(struct irq_data *d)
663+
{
664+
struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
665+
666+
gpiochip_enable_irq(gc, irqd_to_hwirq(d));
667+
}
668+
669+
static const struct irq_chip pm8xxx_irq_chip = {
656670
.name = "ssbi-gpio",
657671
.irq_mask_ack = irq_chip_mask_ack_parent,
658672
.irq_unmask = irq_chip_unmask_parent,
673+
.irq_disable = pm8xxx_irq_disable,
674+
.irq_enable = pm8xxx_irq_enable,
659675
.irq_set_type = irq_chip_set_type_parent,
660-
.flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_SKIP_SET_WAKE,
676+
.flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_SKIP_SET_WAKE |
677+
IRQCHIP_IMMUTABLE,
678+
GPIOCHIP_IRQ_RESOURCE_HELPERS,
661679
};
662680

663681
static int pm8xxx_domain_translate(struct irq_domain *domain,
@@ -788,7 +806,7 @@ static int pm8xxx_gpio_probe(struct platform_device *pdev)
788806
return -ENXIO;
789807

790808
girq = &pctrl->chip.irq;
791-
girq->chip = &pm8xxx_irq_chip;
809+
gpio_irq_chip_set_chip(girq, &pm8xxx_irq_chip);
792810
girq->default_type = IRQ_TYPE_NONE;
793811
girq->handler = handle_level_irq;
794812
girq->fwnode = dev_fwnode(pctrl->dev);

0 commit comments

Comments
 (0)