| Message ID | 20211222171915.9053-3-prabhakar.mahadev-lad.rj@bp.renesas.com |
|---|---|
| State | Accepted |
| Commit | f1ff272c60eded6ba1aa4c64a313910ce6e85bff |
| Headers | show |
| Series | gpio: Use platform_get_irq*() variants to fetch IRQ's | expand |
On Fri, Dec 24, 2021 at 9:21 PM Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> wrote: > > platform_get_resource(pdev, IORESOURCE_IRQ, ..) relies on static > allocation of IRQ resources in DT core code, this causes an issue > when using hierarchical interrupt domains using "interrupts" property > in the node as this bypassed the hierarchical setup and messed up the > irq chaining. > > In preparation for removal of static setup of IRQ resource from DT core > code use platform_get_irq(). ... > - if (devm_request_irq(dev, irq->start, gpio_rcar_irq_handler, > + if (devm_request_irq(dev, p->irq_parent, gpio_rcar_irq_handler, > IRQF_SHARED, name, p)) { > dev_err(dev, "failed to request IRQ\n"); > ret = -ENOENT; While at it, you may unshadow the error code ret = devm_request_irq(...); if (ret) { ... }
Hi Andy, Thank you for the review. On Sat, Dec 25, 2021 at 2:49 PM Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > > On Fri, Dec 24, 2021 at 9:21 PM Lad Prabhakar > <prabhakar.mahadev-lad.rj@bp.renesas.com> wrote: > > > > platform_get_resource(pdev, IORESOURCE_IRQ, ..) relies on static > > allocation of IRQ resources in DT core code, this causes an issue > > when using hierarchical interrupt domains using "interrupts" property > > in the node as this bypassed the hierarchical setup and messed up the > > irq chaining. > > > > In preparation for removal of static setup of IRQ resource from DT core > > code use platform_get_irq(). > > ... > > > - if (devm_request_irq(dev, irq->start, gpio_rcar_irq_handler, > > + if (devm_request_irq(dev, p->irq_parent, gpio_rcar_irq_handler, > > IRQF_SHARED, name, p)) { > > dev_err(dev, "failed to request IRQ\n"); > > ret = -ENOENT; > > While at it, you may unshadow the error code > ret = devm_request_irq(...); > if (ret) { > ... > } > Agreed, will do. Cheers, Prabhakar
On Wed, Dec 22, 2021 at 6:19 PM Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> wrote: > > platform_get_resource(pdev, IORESOURCE_IRQ, ..) relies on static > allocation of IRQ resources in DT core code, this causes an issue > when using hierarchical interrupt domains using "interrupts" property > in the node as this bypassed the hierarchical setup and messed up the > irq chaining. > > In preparation for removal of static setup of IRQ resource from DT core > code use platform_get_irq(). > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > --- Applied, thanks! Bart
diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c index f7b653314e7e..437baecc434e 100644 --- a/drivers/gpio/gpio-rcar.c +++ b/drivers/gpio/gpio-rcar.c @@ -477,7 +477,6 @@ static void gpio_rcar_enable_inputs(struct gpio_rcar_priv *p) static int gpio_rcar_probe(struct platform_device *pdev) { struct gpio_rcar_priv *p; - struct resource *irq; struct gpio_chip *gpio_chip; struct irq_chip *irq_chip; struct gpio_irq_chip *girq; @@ -502,12 +501,10 @@ static int gpio_rcar_probe(struct platform_device *pdev) pm_runtime_enable(dev); - irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); - if (!irq) { - dev_err(dev, "missing IRQ\n"); - ret = -EINVAL; + ret = platform_get_irq(pdev, 0); + if (ret < 0) goto err0; - } + p->irq_parent = ret; p->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(p->base)) { @@ -555,8 +552,7 @@ static int gpio_rcar_probe(struct platform_device *pdev) goto err0; } - p->irq_parent = irq->start; - if (devm_request_irq(dev, irq->start, gpio_rcar_irq_handler, + if (devm_request_irq(dev, p->irq_parent, gpio_rcar_irq_handler, IRQF_SHARED, name, p)) { dev_err(dev, "failed to request IRQ\n"); ret = -ENOENT;
platform_get_resource(pdev, IORESOURCE_IRQ, ..) relies on static allocation of IRQ resources in DT core code, this causes an issue when using hierarchical interrupt domains using "interrupts" property in the node as this bypassed the hierarchical setup and messed up the irq chaining. In preparation for removal of static setup of IRQ resource from DT core code use platform_get_irq(). Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> --- drivers/gpio/gpio-rcar.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)