| Message ID | 20220726141653.177948-3-angelogioacchino.delregno@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | soc: mediatek: Cleanups for MediaTek SVS driver | expand |
On 26/07/2022 16:16, AngeloGioacchino Del Regno wrote: > Instead of using irq_of_parse_and_map() to retrieve the interrupt from > devicetree, switch to platform_get_irq() instead: this function will > conveniently also write an error message in case the irq is not found. > > Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Applied, thanks. > --- > drivers/soc/mediatek/mtk-svs.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/soc/mediatek/mtk-svs.c b/drivers/soc/mediatek/mtk-svs.c > index 600492dc334c..ee990acfc2d5 100644 > --- a/drivers/soc/mediatek/mtk-svs.c > +++ b/drivers/soc/mediatek/mtk-svs.c > @@ -2757,8 +2757,7 @@ static struct svs_platform *svs_platform_probe(struct platform_device *pdev) > static int svs_probe(struct platform_device *pdev) > { > struct svs_platform *svsp; > - unsigned int svsp_irq; > - int ret; > + int svsp_irq, ret; > > svsp = svs_platform_probe(pdev); > if (IS_ERR(svsp)) > @@ -2776,7 +2775,12 @@ static int svs_probe(struct platform_device *pdev) > goto svs_probe_free_resource; > } > > - svsp_irq = irq_of_parse_and_map(svsp->dev->of_node, 0); > + svsp_irq = platform_get_irq(pdev, 0); > + if (svsp_irq < 0) { > + ret = svsp_irq; > + goto svs_probe_free_resource; > + } > + > ret = devm_request_threaded_irq(svsp->dev, svsp_irq, NULL, svs_isr, > svsp->irqflags | IRQF_ONESHOT, > svsp->name, svsp);
diff --git a/drivers/soc/mediatek/mtk-svs.c b/drivers/soc/mediatek/mtk-svs.c index 600492dc334c..ee990acfc2d5 100644 --- a/drivers/soc/mediatek/mtk-svs.c +++ b/drivers/soc/mediatek/mtk-svs.c @@ -2757,8 +2757,7 @@ static struct svs_platform *svs_platform_probe(struct platform_device *pdev) static int svs_probe(struct platform_device *pdev) { struct svs_platform *svsp; - unsigned int svsp_irq; - int ret; + int svsp_irq, ret; svsp = svs_platform_probe(pdev); if (IS_ERR(svsp)) @@ -2776,7 +2775,12 @@ static int svs_probe(struct platform_device *pdev) goto svs_probe_free_resource; } - svsp_irq = irq_of_parse_and_map(svsp->dev->of_node, 0); + svsp_irq = platform_get_irq(pdev, 0); + if (svsp_irq < 0) { + ret = svsp_irq; + goto svs_probe_free_resource; + } + ret = devm_request_threaded_irq(svsp->dev, svsp_irq, NULL, svs_isr, svsp->irqflags | IRQF_ONESHOT, svsp->name, svsp);
Instead of using irq_of_parse_and_map() to retrieve the interrupt from devicetree, switch to platform_get_irq() instead: this function will conveniently also write an error message in case the irq is not found. Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> --- drivers/soc/mediatek/mtk-svs.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)