gpio: realtek-otto: Make the irqchip immutable
PATCH 1/1 gpio: realtek-otto: Make the irqchip immutable
Since commit 6c846d026d49 ("gpio: Don't fiddle with irqchips marked as immutable") a warning is issued for the realtek-otto driver:
gpio gpiochip0: (18003500.gpio): not an immutable chip, please consider fixing it!
Make the driver's irqchip immutable to fix this.
Signed-off-by Sander Vanheule <[email protected]>
--- drivers/gpio/gpio-realtek-otto.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpio/gpio-realtek-otto.c +8 -2
@@ -172,6 +172,8 @@ static void realtek_gpio_irq_unmask(struct irq_data *data)unsigned long flags;u16 m; +gpiochip_enable_irq (&ctrl->gc, line); +raw_spin_lock_irqsave (&ctrl->lock, flags); m = ctrl->intr_mask[port]; m |=realtek_gpio_imr_bits (port_pin,REALTEK_GPIO_IMR_LINE_MASK );
@@ -195,6 +197,8 @@ static void realtek_gpio_irq_mask(struct irq_data *data) ctrl->intr_mask[port] = m;realtek_gpio_write_imr (ctrl, port, ctrl->intr_type[port], m);raw_spin_unlock_irqrestore (&ctrl->lock, flags); + +gpiochip_disable_irq (&ctrl->gc, line); }static int realtek_gpio_irq_set_type (struct irq_data *data,unsigned int flow_type)
@@ -316,13 +320,15 @@ static int realtek_gpio_irq_init(struct gpio_chip *gc)return 0 ; } -static struct irq_chip realtek_gpio_irq_chip = { +static const struct irq_chip realtek_gpio_irq_chip = { .name ="realtek-otto-gpio" , .irq_ack = realtek_gpio_irq_ack, .irq_mask = realtek_gpio_irq_mask, .irq_unmask = realtek_gpio_irq_unmask, .irq_set_type = realtek_gpio_irq_set_type, .irq_set_affinity = realtek_gpio_irq_set_affinity, + .flags =IRQCHIP_IMMUTABLE , +GPIOCHIP_IRQ_RESOURCE_HELPERS , };static const struct of_device_id realtek_gpio_of_match[] = {
@@ -405,7 +411,7 @@ static int realtek_gpio_probe(struct platform_device *pdev) irq =platform_get_irq_optional (pdev,0 );if (!(dev_flags &GPIO_INTERRUPTS_DISABLED ) && irq >0 ) { girq = &ctrl->gc.irq; - girq->chip = &realtek_gpio_irq_chip; +gpio_irq_chip_set_chip (girq, &realtek_gpio_irq_chip); girq->default_type =IRQ_TYPE_NONE ; girq->handler = handle_bad_irq; girq->parent_handler = realtek_gpio_irq_handler;
Signature · 1 line
2.36.1
Bartosz Golaszewski
AppliedQuoted 10 lines · Sander Vanheule
Since commit
6c846d026d49("gpio: Don't fiddle with irqchips marked as immutable") a warning is issued for the realtek-otto driver:gpio gpiochip0: (18003500.gpio): not an immutable chip, please consider fixing it!
Make the driver's irqchip immutable to fix this.
Signed-off-by Sander Vanheule <[email protected]>---
Applied, thanks!
Bart