| Message ID | 20211222171915.9053-2-prabhakar.mahadev-lad.rj@bp.renesas.com |
|---|---|
| State | Accepted |
| Commit | 6408693f95275ffec5327d97a4ed22def8b20692 |
| Headers | show |
| Series | gpio: Use platform_get_irq*() variants to fetch IRQ's | expand |
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> > --- > drivers/gpio/gpio-ts5500.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpio/gpio-ts5500.c b/drivers/gpio/gpio-ts5500.c > index c91890488402..b159e92a3612 100644 > --- a/drivers/gpio/gpio-ts5500.c > +++ b/drivers/gpio/gpio-ts5500.c > @@ -317,22 +317,19 @@ static int ts5500_dio_probe(struct platform_device *pdev) > struct device *dev = &pdev->dev; > const char *name = dev_name(dev); > struct ts5500_priv *priv; > - struct resource *res; > unsigned long flags; > int ret; > > - res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); > - if (!res) { > - dev_err(dev, "missing IRQ resource\n"); > - return -EINVAL; > - } > + ret = platform_get_irq(pdev, 0); > + if (ret < 0) > + return ret; > > priv = devm_kzalloc(dev, sizeof(struct ts5500_priv), GFP_KERNEL); > if (!priv) > return -ENOMEM; > > platform_set_drvdata(pdev, priv); > - priv->hwirq = res->start; > + priv->hwirq = ret; > spin_lock_init(&priv->lock); > > priv->gpio_chip.owner = THIS_MODULE; > -- > 2.17.1 > Applied, thanks! Bart
diff --git a/drivers/gpio/gpio-ts5500.c b/drivers/gpio/gpio-ts5500.c index c91890488402..b159e92a3612 100644 --- a/drivers/gpio/gpio-ts5500.c +++ b/drivers/gpio/gpio-ts5500.c @@ -317,22 +317,19 @@ static int ts5500_dio_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; const char *name = dev_name(dev); struct ts5500_priv *priv; - struct resource *res; unsigned long flags; int ret; - res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); - if (!res) { - dev_err(dev, "missing IRQ resource\n"); - return -EINVAL; - } + ret = platform_get_irq(pdev, 0); + if (ret < 0) + return ret; priv = devm_kzalloc(dev, sizeof(struct ts5500_priv), GFP_KERNEL); if (!priv) return -ENOMEM; platform_set_drvdata(pdev, priv); - priv->hwirq = res->start; + priv->hwirq = ret; spin_lock_init(&priv->lock); priv->gpio_chip.owner = THIS_MODULE;
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-ts5500.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)