[PATCH] pinctrl: nuvoton: wpcm450: Convert irqchip to IRQCHIP_IMMUTABLE

Marc Zyngier maz at kernel.org
Tue Jun 7 17:29:05 AEST 2022


On Mon, 06 Jun 2022 22:43:00 +0100,
Jonathan Neuschäfer <j.neuschaefer at gmx.net> wrote:
> 
> Commit 6c846d026d490 ("gpio: Don't fiddle with irqchips marked as
> immutable") added a warning for irqchips that are not marked with
> IRQCHIP_IMMUTABLE.
> 
> Convert the pinctrl-wpcm450 driver to an immutable irqchip.
> 
> Signed-off-by: Jonathan Neuschäfer <j.neuschaefer at gmx.net>
> ---
>  drivers/pinctrl/nuvoton/pinctrl-wpcm450.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c b/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c
> index 0dbeb91f0bf27..cff784a7ce4d7 100644
> --- a/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c
> +++ b/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c
> @@ -293,6 +293,8 @@ static const struct irq_chip wpcm450_gpio_irqchip = {
>  	.irq_unmask = wpcm450_gpio_irq_unmask,
>  	.irq_mask = wpcm450_gpio_irq_mask,
>  	.irq_set_type = wpcm450_gpio_set_irq_type,
> +	.flags = IRQCHIP_IMMUTABLE,
> +	GPIOCHIP_IRQ_RESOURCE_HELPERS,
>  };
> 
>  static void wpcm450_gpio_irqhandler(struct irq_desc *desc)
> @@ -1068,9 +1070,8 @@ static int wpcm450_gpio_register(struct platform_device *pdev,
>  		gpio->gc.fwnode = child;
>  		gpio->gc.add_pin_ranges = wpcm450_gpio_add_pin_ranges;
> 
> -		gpio->irqc = wpcm450_gpio_irqchip;
>  		girq = &gpio->gc.irq;
> -		girq->chip = &gpio->irqc;
> +		gpio_irq_chip_set_chip(girq, &wpcm450_gpio_irqchip);
>  		girq->parent_handler = wpcm450_gpio_irqhandler;
>  		girq->parents = devm_kcalloc(dev, WPCM450_NUM_GPIO_IRQS,
>  					     sizeof(*girq->parents), GFP_KERNEL);

You are definitely missing the required updates to the mask/unmask
methods, and you still have a now useless irq_chip structure in
wpcm450_gpio.

	M.

-- 
Without deviation from the norm, progress is not possible.


More information about the openbmc mailing list