| Message ID | 20230215-immutable-chips-v1-16-51a8f224a5d0@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Mass convert GPIO IRQ chips to be immutable | expand |
On Thu, Feb 16, 2023 at 10:37:17AM +0100, Linus Walleij wrote: > Convert the driver to immutable irq-chip with a bit of > intuition. > > Cc: Marc Zyngier <maz@kernel.org> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> FYI, I'm migrating pci-idio-16 to the regmap-irq API soon, so this patch might not be necessary once the code is removed. Anyway, here's my ack in case this patch series is merged first. Acked-by: William Breathitt Gray <william.gray@linaro.org> > --- > drivers/gpio/gpio-pci-idio-16.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpio/gpio-pci-idio-16.c b/drivers/gpio/gpio-pci-idio-16.c > index a86ce748384b..6726c32e31e6 100644 > --- a/drivers/gpio/gpio-pci-idio-16.c > +++ b/drivers/gpio/gpio-pci-idio-16.c > @@ -107,6 +107,8 @@ static void idio_16_irq_mask(struct irq_data *data) > > raw_spin_unlock_irqrestore(&idio16gpio->lock, flags); > } > + > + gpiochip_disable_irq(chip, irqd_to_hwirq(data)); > } > > static void idio_16_irq_unmask(struct irq_data *data) > @@ -117,6 +119,8 @@ static void idio_16_irq_unmask(struct irq_data *data) > const unsigned long prev_irq_mask = idio16gpio->irq_mask; > unsigned long flags; > > + gpiochip_enable_irq(chip, irqd_to_hwirq(data)); > + > idio16gpio->irq_mask |= mask; > > if (!prev_irq_mask) { > @@ -138,12 +142,14 @@ static int idio_16_irq_set_type(struct irq_data *data, unsigned int flow_type) > return 0; > } > > -static struct irq_chip idio_16_irqchip = { > +static const struct irq_chip idio_16_irqchip = { > .name = "pci-idio-16", > .irq_ack = idio_16_irq_ack, > .irq_mask = idio_16_irq_mask, > .irq_unmask = idio_16_irq_unmask, > - .irq_set_type = idio_16_irq_set_type > + .irq_set_type = idio_16_irq_set_type, > + .flags = IRQCHIP_IMMUTABLE, > + GPIOCHIP_IRQ_RESOURCE_HELPERS, > }; > > static irqreturn_t idio_16_irq_handler(int irq, void *dev_id) > @@ -242,7 +248,7 @@ static int idio_16_probe(struct pci_dev *pdev, const struct pci_device_id *id) > idio_16_state_init(&idio16gpio->state); > > girq = &idio16gpio->chip.irq; > - girq->chip = &idio_16_irqchip; > + gpio_irq_chip_set_chip(girq, &idio_16_irqchip); > /* This will let us handle the parent IRQ in the driver */ > girq->parent_handler = NULL; > girq->num_parents = 0; > > -- > 2.34.1 >
diff --git a/drivers/gpio/gpio-pci-idio-16.c b/drivers/gpio/gpio-pci-idio-16.c index a86ce748384b..6726c32e31e6 100644 --- a/drivers/gpio/gpio-pci-idio-16.c +++ b/drivers/gpio/gpio-pci-idio-16.c @@ -107,6 +107,8 @@ static void idio_16_irq_mask(struct irq_data *data) raw_spin_unlock_irqrestore(&idio16gpio->lock, flags); } + + gpiochip_disable_irq(chip, irqd_to_hwirq(data)); } static void idio_16_irq_unmask(struct irq_data *data) @@ -117,6 +119,8 @@ static void idio_16_irq_unmask(struct irq_data *data) const unsigned long prev_irq_mask = idio16gpio->irq_mask; unsigned long flags; + gpiochip_enable_irq(chip, irqd_to_hwirq(data)); + idio16gpio->irq_mask |= mask; if (!prev_irq_mask) { @@ -138,12 +142,14 @@ static int idio_16_irq_set_type(struct irq_data *data, unsigned int flow_type) return 0; } -static struct irq_chip idio_16_irqchip = { +static const struct irq_chip idio_16_irqchip = { .name = "pci-idio-16", .irq_ack = idio_16_irq_ack, .irq_mask = idio_16_irq_mask, .irq_unmask = idio_16_irq_unmask, - .irq_set_type = idio_16_irq_set_type + .irq_set_type = idio_16_irq_set_type, + .flags = IRQCHIP_IMMUTABLE, + GPIOCHIP_IRQ_RESOURCE_HELPERS, }; static irqreturn_t idio_16_irq_handler(int irq, void *dev_id) @@ -242,7 +248,7 @@ static int idio_16_probe(struct pci_dev *pdev, const struct pci_device_id *id) idio_16_state_init(&idio16gpio->state); girq = &idio16gpio->chip.irq; - girq->chip = &idio_16_irqchip; + gpio_irq_chip_set_chip(girq, &idio_16_irqchip); /* This will let us handle the parent IRQ in the driver */ girq->parent_handler = NULL; girq->num_parents = 0;
Convert the driver to immutable irq-chip with a bit of intuition. Cc: Marc Zyngier <maz@kernel.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/gpio/gpio-pci-idio-16.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)