lkml.org 
[lkml]   [2021]   [Dec]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: [PATCH] thermal: rcar_thermal: Use platform_get_irq_optional() to get the interrupt
From
Date
On 18/12/2021 15:41, Lad Prabhakar 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 bypasses the hierarchical setup and messes up the
> irq chaining.
>
> In preparation for removal of static setup of IRQ resource from DT core
> code use platform_get_irq_optional().
>
> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> ---
> Hi,
>
> Dropping usage of platform_get_resource() was agreed based on
> the discussion [0].
>
> [0] https://patchwork.kernel.org/project/linux-renesas-soc/
> patch/20211209001056.29774-1-prabhakar.mahadev-lad.rj@bp.renesas.com/
>
> Cheers,
> Prabhakar
> ---
> drivers/thermal/rcar_thermal.c | 15 +++++++++++----
> 1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
> index b49f04daaf47..e4c7bc1bf7ef 100644
> --- a/drivers/thermal/rcar_thermal.c
> +++ b/drivers/thermal/rcar_thermal.c
> @@ -445,7 +445,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
> struct rcar_thermal_common *common;
> struct rcar_thermal_priv *priv;
> struct device *dev = &pdev->dev;
> - struct resource *res, *irq;
> + struct resource *res;
> const struct rcar_thermal_chip *chip = of_device_get_match_data(dev);
> int mres = 0;
> int i;
> @@ -467,9 +467,16 @@ static int rcar_thermal_probe(struct platform_device *pdev)
> pm_runtime_get_sync(dev);
>
> for (i = 0; i < chip->nirqs; i++) {
> - irq = platform_get_resource(pdev, IORESOURCE_IRQ, i);
> - if (!irq)
> + int irq;
> +
> + irq = platform_get_irq_optional(pdev, i);
> + if (irq <= 0 && irq != -ENXIO) {
> + ret = irq ? irq : -ENXIO;
> + goto error_unregister;
> + }
> + if (irq == -ENXIO)
> continue;

Why not invert the conditions?

if (irq == -ENXIO)
continue;

if (irq <= 0) {
ret = irq ? irq : -ENXIO;
goto out_unregister;
}


> +
> if (!common->base) {
> /*
> * platform has IRQ support.
> @@ -487,7 +494,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
> idle = 0; /* polling delay is not needed */
> }
>
> - ret = devm_request_irq(dev, irq->start, rcar_thermal_irq,
> + ret = devm_request_irq(dev, irq, rcar_thermal_irq,
> IRQF_SHARED, dev_name(dev), common);
> if (ret) {
> dev_err(dev, "irq request failed\n ");
>


--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

\
 
 \ /
  Last update: 2021-12-20 13:31    [W:0.059 / U:0.040 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site