| Message ID | 20220104164504.24707-1-prabhakar.mahadev-lad.rj@bp.renesas.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v5] soc: ti: smartreflex: Use platform_get_irq_optional() to get the interrupt | expand |
On Tue, Jan 4, 2022 at 6:45 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 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. ... > + ret = platform_get_irq_optional(pdev, 0); > + if (ret < 0 && ret != -ENXIO) > + return dev_err_probe(&pdev->dev, ret, "%s: failed to get IRQ resource\n", __func__); Sorry, I haven't noticed that you are using __func__ in the message. Please don't. It shows either that the message is not unique (so make the message unique enough in this driver) or the redundancy of the __func__ (it doesn't add any value, but noise). > + if (ret > 0) > + sr_info->irq = ret;
Hi Andy, Thank you for the review. On Wed, Jan 5, 2022 at 9:47 AM Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > > On Tue, Jan 4, 2022 at 6:45 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 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. > > ... > > > + ret = platform_get_irq_optional(pdev, 0); > > + if (ret < 0 && ret != -ENXIO) > > + return dev_err_probe(&pdev->dev, ret, "%s: failed to get IRQ resource\n", __func__); > > Sorry, I haven't noticed that you are using __func__ in the message. > Please don't. It shows either that the message is not unique (so make > the message unique enough in this driver) or the redundancy of the > __func__ (it doesn't add any value, but noise). > Thanks for the pointer, I was just keeping the messages in-sync with the driver. Cheers, Prabhakar
diff --git a/drivers/soc/ti/smartreflex.c b/drivers/soc/ti/smartreflex.c index b5b2fa538d5c..8a0e97a7edc6 100644 --- a/drivers/soc/ti/smartreflex.c +++ b/drivers/soc/ti/smartreflex.c @@ -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; @@ -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, "%s: failed to get IRQ resource\n", __func__); + if (ret > 0) + sr_info->irq = ret; sr_info->fck = devm_clk_get(pdev->dev.parent, "fck"); if (IS_ERR(sr_info->fck)) @@ -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); @@ -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);
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> --- v4->v5: * Fixed missing return while using dev_err_probe(). v3->v4: * Used dev_err_probe() to print error message * Returning 0 in probe success path. v2->v3 * Switch back to platform_get_irq_optional() * Only print error in case of error, and not when interrupt is missing. v1->v2 * Updated commit message * Drop check for IRQ0 * Switched to using platform_get_irq() so that the probe won't fail silently as requested by Nishanth. v1: * https://www.spinics.net/lists/arm-kernel/msg942549.html --- drivers/soc/ti/smartreflex.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)