]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
gpio: lpc18xx: Make irq_chip immutable
authorPeng Fan <peng.fan@nxp.com>
Fri, 9 May 2025 04:45:34 +0000 (12:45 +0800)
committerBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Thu, 15 May 2025 15:02:22 +0000 (17:02 +0200)
Kernel warns about mutable irq_chips:
"not an immutable chip, please consider fixing!"

Constify lpc18xx_gpio_pin_ic, flag the irq_chip as IRQCHIP_IMMUTABLE,
add the new helper functions, and call the appropriate gpiolib functions.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20250509-gpio-v1-3-639377c98288@nxp.com
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
drivers/gpio/gpio-lpc18xx.c

index 8bb8a87ec1e9935f4ebd3b6ff3d6751ea766e613..fffc13da673efbc3b6d901d7a3950f441e97ae38 100644 (file)
@@ -42,6 +42,7 @@ struct lpc18xx_gpio_pin_ic {
        void __iomem *base;
        struct irq_domain *domain;
        struct raw_spinlock lock;
+       struct gpio_chip *gpio;
 };
 
 struct lpc18xx_gpio_chip {
@@ -74,6 +75,7 @@ static void lpc18xx_gpio_pin_ic_mask(struct irq_data *d)
 {
        struct lpc18xx_gpio_pin_ic *ic = d->chip_data;
        u32 type = irqd_get_trigger_type(d);
+       irq_hw_number_t hwirq = irqd_to_hwirq(d);
 
        raw_spin_lock(&ic->lock);
 
@@ -88,12 +90,17 @@ static void lpc18xx_gpio_pin_ic_mask(struct irq_data *d)
        raw_spin_unlock(&ic->lock);
 
        irq_chip_mask_parent(d);
+
+       gpiochip_disable_irq(ic->gpio, hwirq);
 }
 
 static void lpc18xx_gpio_pin_ic_unmask(struct irq_data *d)
 {
        struct lpc18xx_gpio_pin_ic *ic = d->chip_data;
        u32 type = irqd_get_trigger_type(d);
+       irq_hw_number_t hwirq = irqd_to_hwirq(d);
+
+       gpiochip_enable_irq(ic->gpio, hwirq);
 
        raw_spin_lock(&ic->lock);
 
@@ -149,13 +156,14 @@ static int lpc18xx_gpio_pin_ic_set_type(struct irq_data *d, unsigned int type)
        return 0;
 }
 
-static struct irq_chip lpc18xx_gpio_pin_ic = {
+static const struct irq_chip lpc18xx_gpio_pin_ic = {
        .name           = "LPC18xx GPIO pin",
        .irq_mask       = lpc18xx_gpio_pin_ic_mask,
        .irq_unmask     = lpc18xx_gpio_pin_ic_unmask,
        .irq_eoi        = lpc18xx_gpio_pin_ic_eoi,
        .irq_set_type   = lpc18xx_gpio_pin_ic_set_type,
-       .flags          = IRQCHIP_SET_TYPE_MASKED,
+       .flags          = IRQCHIP_IMMUTABLE | IRQCHIP_SET_TYPE_MASKED,
+       GPIOCHIP_IRQ_RESOURCE_HELPERS,
 };
 
 static int lpc18xx_gpio_pin_ic_domain_alloc(struct irq_domain *domain,
@@ -251,6 +259,7 @@ static int lpc18xx_gpio_pin_ic_probe(struct lpc18xx_gpio_chip *gc)
                goto free_iomap;
        }
 
+       ic->gpio = &gc->gpio;
        gc->pin_ic = ic;
 
        return 0;