Skip to content

Commit

Permalink
soc: ti: smartreflex: Use platform_get_irq_optional() to get the inte…
Browse files Browse the repository at this point in the history
…rrupt

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().

While at it return 0 instead of returning ret in the probe success path.

Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20220105180323.8563-1-prabhakar.mahadev-lad.rj@bp.renesas.com
  • Loading branch information
Lad Prabhakar authored and Nishanth Menon committed Feb 2, 2022
1 parent a8eba8d commit 001d7c8
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions drivers/soc/ti/smartreflex.c
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ static int omap_sr_probe(struct platform_device *pdev)
{
struct omap_sr *sr_info;
struct omap_sr_data *pdata = pdev->dev.platform_data;
struct resource *mem, *irq;
struct resource *mem;
struct dentry *nvalue_dir;
int i, ret = 0;

Expand All @@ -844,7 +844,11 @@ static int omap_sr_probe(struct platform_device *pdev)
if (IS_ERR(sr_info->base))
return PTR_ERR(sr_info->base);

irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
ret = platform_get_irq_optional(pdev, 0);
if (ret < 0 && ret != -ENXIO)
return dev_err_probe(&pdev->dev, ret, "failed to get IRQ resource\n");
if (ret > 0)
sr_info->irq = ret;

sr_info->fck = devm_clk_get(pdev->dev.parent, "fck");
if (IS_ERR(sr_info->fck))
Expand All @@ -870,9 +874,6 @@ static int omap_sr_probe(struct platform_device *pdev)
sr_info->autocomp_active = false;
sr_info->ip_type = pdata->ip_type;

if (irq)
sr_info->irq = irq->start;

sr_set_clk_length(sr_info);

list_add(&sr_info->node, &sr_list);
Expand Down Expand Up @@ -926,7 +927,7 @@ static int omap_sr_probe(struct platform_device *pdev)

}

return ret;
return 0;

err_debugfs:
debugfs_remove_recursive(sr_info->dbg_dir);
Expand Down

0 comments on commit 001d7c8

Please sign in to comment.