Re: [PATCH v2 3/3] pinctrl: cherryview: Pass irqchip when adding gpiochip

Andy Shevchenko
2019-11-06T16:16:29Z

On Wed, Nov 06, 2019 at 04:47:15PM +0100, Hans de Goede 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.

> + chip->irq.chip = &pctrl->irqchip;

> + if (pctrl->need_valid_mask)
> + chip->irq.init_valid_mask = chv_init_irq_valid_mask;

I just realize we probably may assign here unconditionally

> + chip->irq.init_hw = chv_gpio_irq_init_hw;
> + chip->irq.parent_handler = chv_gpio_irq_handler;
> + chip->irq.num_parents = 1;
> + chip->irq.parents = &pctrl->irq;
> + chip->irq.default_type = IRQ_TYPE_NONE;
> + chip->irq.handler = handle_bad_irq;
>
> if (!pctrl->need_valid_mask) {
> irq_base = devm_irq_alloc_descs(pctrl->dev, -1, 0,
> @@ -1640,18 +1651,9 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq)
> }
> }
>
> - pctrl->irqchip.name = "chv-gpio";
> - pctrl->irqchip.irq_startup = chv_gpio_irq_startup;
> - pctrl->irqchip.irq_ack = chv_gpio_irq_ack;
> - pctrl->irqchip.irq_mask = chv_gpio_irq_mask;
> - pctrl->irqchip.irq_unmask = chv_gpio_irq_unmask;
> - pctrl->irqchip.irq_set_type = chv_gpio_irq_type;
> - pctrl->irqchip.flags = IRQCHIP_SKIP_SET_WAKE;
> -
> - ret = gpiochip_irqchip_add(chip, &pctrl->irqchip, 0,
> - handle_bad_irq, IRQ_TYPE_NONE);
> + ret = devm_gpiochip_add_data(pctrl->dev, chip, pctrl);
> if (ret) {
> - dev_err(pctrl->dev, "failed to add IRQ chip\n");
> + dev_err(pctrl->dev, "Failed to register gpiochip\n");
> return ret;
> }
>
> @@ -1665,8 +1667,6 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq)
> }
> }
>
> - gpiochip_set_chained_irqchip(chip, &pctrl->irqchip, irq,
> - chv_gpio_irq_handler);
> return 0;
> }
>
> --
> 2.23.0
>

--
With Best Regards,
Andy Shevchenko