Re: [PATCH v2] pinctrl: intel: baytrail: Pass irqchip when adding gpiochip

[Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>]

On Sat, Oct 05, 2019 at 10:47:47PM +0200, Linus Walleij wrote:
> We need to convert all old gpio irqchips to pass the irqchip
> setup along when adding the gpio_chip. For more info see
> drivers/gpio/TODO.
> 
> For chained irqchips this is a pretty straight-forward
> conversion.
> 
> Cc: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> Cc: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
> Cc: Thierry Reding <treding@xxxxxxxxxx>
> Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
> ---
> ChangeLog v1->v2:
> - Rebase on v5.4-rc1

I would like to push it to my tree, I need to understand if the for-next is
the okay target for it.

> ---
>  drivers/pinctrl/intel/pinctrl-baytrail.c | 38 ++++++++++++++----------
>  1 file changed, 22 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/pinctrl/intel/pinctrl-baytrail.c b/drivers/pinctrl/intel/pinctrl-baytrail.c
> index 9ffb22211d2b..64a59fc08b63 100644
> --- a/drivers/pinctrl/intel/pinctrl-baytrail.c
> +++ b/drivers/pinctrl/intel/pinctrl-baytrail.c
> @@ -1528,6 +1528,28 @@ static int byt_gpio_probe(struct byt_gpio *vg)
>  	if (!vg->saved_context)
>  		return -ENOMEM;
>  #endif
> +
> +	/* set up interrupts  */
> +	irq_rc = platform_get_resource(vg->pdev, IORESOURCE_IRQ, 0);
> +	if (irq_rc && irq_rc->start) {
> +		struct gpio_irq_chip *girq;
> +
> +		byt_gpio_irq_init_hw(vg);
> +
> +		girq = &gc->irq;
> +		girq->chip = &byt_irqchip;
> +		girq->parent_handler = byt_gpio_irq_handler;

> +		girq->num_parents = 1;

For consistency I would use this below.
I will update when applying.

> +		girq->parents = devm_kcalloc(&vg->pdev->dev, 1,
> +					     sizeof(*girq->parents),
> +					     GFP_KERNEL);
> +		if (!girq->parents)
> +			return -ENOMEM;
> +		girq->parents[0] = (unsigned int)irq_rc->start;
> +		girq->default_type = IRQ_TYPE_NONE;
> +		girq->handler = handle_bad_irq;
> +	}
> +
>  	ret = devm_gpiochip_add_data(&vg->pdev->dev, gc, vg);
>  	if (ret) {
>  		dev_err(&vg->pdev->dev, "failed adding byt-gpio chip\n");
> @@ -1541,22 +1563,6 @@ static int byt_gpio_probe(struct byt_gpio *vg)
>  		return ret;
>  	}
>  
> -	/* set up interrupts  */
> -	irq_rc = platform_get_resource(vg->pdev, IORESOURCE_IRQ, 0);
> -	if (irq_rc && irq_rc->start) {
> -		byt_gpio_irq_init_hw(vg);
> -		ret = gpiochip_irqchip_add(gc, &byt_irqchip, 0,
> -					   handle_bad_irq, IRQ_TYPE_NONE);
> -		if (ret) {
> -			dev_err(&vg->pdev->dev, "failed to add irqchip\n");
> -			return ret;
> -		}
> -
> -		gpiochip_set_chained_irqchip(gc, &byt_irqchip,
> -					     (unsigned)irq_rc->start,
> -					     byt_gpio_irq_handler);
> -	}
> -
>  	return ret;
>  }
>  
> -- 
> 2.21.0
> 

-- 
With Best Regards,
Andy Shevchenko