Convert the probe function to dev_err_probe() which helps users to
identify issues better.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
drivers/dma/imx-sdma.c | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index f6bb2f88a62781c0431336c365fa30c46f1401ad..e30dd46cf6522ee2aa4d3aca9868a01afbd29615 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -2255,7 +2255,7 @@ static int sdma_probe(struct platform_device *pdev)
ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
if (ret)
- return ret;
+ return dev_err_probe(dev, ret, "Failed to set DMA mask\n");
sdma = devm_kzalloc(dev, sizeof(*sdma), GFP_KERNEL);
if (!sdma)
@@ -2272,24 +2272,24 @@ static int sdma_probe(struct platform_device *pdev)
irq = platform_get_irq(pdev, 0);
if (irq < 0)
- return irq;
+ return dev_err_probe(dev, irq, "Failed to get IRQ\n");
sdma->regs = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(sdma->regs))
- return PTR_ERR(sdma->regs);
+ return dev_err_probe(dev, PTR_ERR(sdma->regs), "ioremap failed\n");
sdma->clk_ipg = devm_clk_get_prepared(dev, "ipg");
if (IS_ERR(sdma->clk_ipg))
- return PTR_ERR(sdma->clk_ipg);
+ return dev_err_probe(dev, PTR_ERR(sdma->clk_ipg), "IPG clk_get_prepared failed\n");
sdma->clk_ahb = devm_clk_get_prepared(dev, "ahb");
if (IS_ERR(sdma->clk_ahb))
- return PTR_ERR(sdma->clk_ahb);
+ return dev_err_probe(dev, PTR_ERR(sdma->clk_ahb), "AHB clk_get_prepared failed\n");
ret = devm_request_irq(dev, irq, sdma_int_handler, 0,
dev_name(dev), sdma);
if (ret)
- return ret;
+ return dev_err_probe(dev, ret, "Failed to request IRQ\n");
sdma->irq = irq;
@@ -2330,11 +2330,11 @@ static int sdma_probe(struct platform_device *pdev)
ret = sdma_init(sdma);
if (ret)
- return ret;
+ return dev_err_probe(dev, ret, "sdma_init failed\n");
ret = sdma_event_remap(sdma);
if (ret)
- return ret;
+ return dev_err_probe(dev, ret, "sdma_event_remap failed\n");
if (sdma->drvdata->script_addrs)
sdma_add_scripts(sdma, sdma->drvdata->script_addrs);
@@ -2361,18 +2361,14 @@ static int sdma_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, sdma);
ret = dma_async_device_register(&sdma->dma_device);
- if (ret) {
- dev_err(dev, "unable to register\n");
- return ret;
- }
+ if (ret)
+ return dev_err_probe(dev, ret, "unable to register\n");
devm_add_action_or_reset(dev, sdma_dma_device_unregister_action, sdma);
ret = of_dma_controller_register(np, sdma_xlate, sdma);
- if (ret) {
- dev_err(dev, "failed to register controller\n");
- return ret;
- }
+ if (ret)
+ return dev_err_probe(dev, ret, "failed to register controller\n");
spba_bus = of_find_compatible_node(NULL, NULL, "fsl,spba-bus");
ret = of_address_to_resource(spba_bus, 0, &spba_res);
--
2.47.2
On Wed, Sep 03, 2025 at 03:06:15PM +0200, Marco Felsch wrote: > Convert the probe function to dev_err_probe() which helps users to > identify issues better. I think it is not "convert" Add dev_err_probe() at return path of probe to help user to ... Reviewed-by: Frank Li <Frank.Li@nxp.com> > > Signed-off-by: Marco Felsch <m.felsch@pengutronix.de> > --- > drivers/dma/imx-sdma.c | 28 ++++++++++++---------------- > 1 file changed, 12 insertions(+), 16 deletions(-) > > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c > index f6bb2f88a62781c0431336c365fa30c46f1401ad..e30dd46cf6522ee2aa4d3aca9868a01afbd29615 100644 > --- a/drivers/dma/imx-sdma.c > +++ b/drivers/dma/imx-sdma.c > @@ -2255,7 +2255,7 @@ static int sdma_probe(struct platform_device *pdev) > > ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32)); > if (ret) > - return ret; > + return dev_err_probe(dev, ret, "Failed to set DMA mask\n"); > > sdma = devm_kzalloc(dev, sizeof(*sdma), GFP_KERNEL); > if (!sdma) > @@ -2272,24 +2272,24 @@ static int sdma_probe(struct platform_device *pdev) > > irq = platform_get_irq(pdev, 0); > if (irq < 0) > - return irq; > + return dev_err_probe(dev, irq, "Failed to get IRQ\n"); > > sdma->regs = devm_platform_ioremap_resource(pdev, 0); > if (IS_ERR(sdma->regs)) > - return PTR_ERR(sdma->regs); > + return dev_err_probe(dev, PTR_ERR(sdma->regs), "ioremap failed\n"); > > sdma->clk_ipg = devm_clk_get_prepared(dev, "ipg"); > if (IS_ERR(sdma->clk_ipg)) > - return PTR_ERR(sdma->clk_ipg); > + return dev_err_probe(dev, PTR_ERR(sdma->clk_ipg), "IPG clk_get_prepared failed\n"); > > sdma->clk_ahb = devm_clk_get_prepared(dev, "ahb"); > if (IS_ERR(sdma->clk_ahb)) > - return PTR_ERR(sdma->clk_ahb); > + return dev_err_probe(dev, PTR_ERR(sdma->clk_ahb), "AHB clk_get_prepared failed\n"); > > ret = devm_request_irq(dev, irq, sdma_int_handler, 0, > dev_name(dev), sdma); > if (ret) > - return ret; > + return dev_err_probe(dev, ret, "Failed to request IRQ\n"); > > sdma->irq = irq; > > @@ -2330,11 +2330,11 @@ static int sdma_probe(struct platform_device *pdev) > > ret = sdma_init(sdma); > if (ret) > - return ret; > + return dev_err_probe(dev, ret, "sdma_init failed\n"); > > ret = sdma_event_remap(sdma); > if (ret) > - return ret; > + return dev_err_probe(dev, ret, "sdma_event_remap failed\n"); > > if (sdma->drvdata->script_addrs) > sdma_add_scripts(sdma, sdma->drvdata->script_addrs); > @@ -2361,18 +2361,14 @@ static int sdma_probe(struct platform_device *pdev) > platform_set_drvdata(pdev, sdma); > > ret = dma_async_device_register(&sdma->dma_device); > - if (ret) { > - dev_err(dev, "unable to register\n"); > - return ret; > - } > + if (ret) > + return dev_err_probe(dev, ret, "unable to register\n"); > > devm_add_action_or_reset(dev, sdma_dma_device_unregister_action, sdma); > > ret = of_dma_controller_register(np, sdma_xlate, sdma); > - if (ret) { > - dev_err(dev, "failed to register controller\n"); > - return ret; > - } > + if (ret) > + return dev_err_probe(dev, ret, "failed to register controller\n"); > > spba_bus = of_find_compatible_node(NULL, NULL, "fsl,spba-bus"); > ret = of_address_to_resource(spba_bus, 0, &spba_res); > > -- > 2.47.2 >
On 25-09-03, Frank Li wrote: > On Wed, Sep 03, 2025 at 03:06:15PM +0200, Marco Felsch wrote: > > Convert the probe function to dev_err_probe() which helps users to > > identify issues better. > > I think it is not "convert" > > Add dev_err_probe() at return path of probe to help user to ... Done, thanks. > Reviewed-by: Frank Li <Frank.Li@nxp.com> > > > > Signed-off-by: Marco Felsch <m.felsch@pengutronix.de> > > --- > > drivers/dma/imx-sdma.c | 28 ++++++++++++---------------- > > 1 file changed, 12 insertions(+), 16 deletions(-) > > > > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c > > index f6bb2f88a62781c0431336c365fa30c46f1401ad..e30dd46cf6522ee2aa4d3aca9868a01afbd29615 100644 > > --- a/drivers/dma/imx-sdma.c > > +++ b/drivers/dma/imx-sdma.c > > @@ -2255,7 +2255,7 @@ static int sdma_probe(struct platform_device *pdev) > > > > ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32)); > > if (ret) > > - return ret; > > + return dev_err_probe(dev, ret, "Failed to set DMA mask\n"); > > > > sdma = devm_kzalloc(dev, sizeof(*sdma), GFP_KERNEL); > > if (!sdma) > > @@ -2272,24 +2272,24 @@ static int sdma_probe(struct platform_device *pdev) > > > > irq = platform_get_irq(pdev, 0); > > if (irq < 0) > > - return irq; > > + return dev_err_probe(dev, irq, "Failed to get IRQ\n"); > > > > sdma->regs = devm_platform_ioremap_resource(pdev, 0); > > if (IS_ERR(sdma->regs)) > > - return PTR_ERR(sdma->regs); > > + return dev_err_probe(dev, PTR_ERR(sdma->regs), "ioremap failed\n"); > > > > sdma->clk_ipg = devm_clk_get_prepared(dev, "ipg"); > > if (IS_ERR(sdma->clk_ipg)) > > - return PTR_ERR(sdma->clk_ipg); > > + return dev_err_probe(dev, PTR_ERR(sdma->clk_ipg), "IPG clk_get_prepared failed\n"); > > > > sdma->clk_ahb = devm_clk_get_prepared(dev, "ahb"); > > if (IS_ERR(sdma->clk_ahb)) > > - return PTR_ERR(sdma->clk_ahb); > > + return dev_err_probe(dev, PTR_ERR(sdma->clk_ahb), "AHB clk_get_prepared failed\n"); > > > > ret = devm_request_irq(dev, irq, sdma_int_handler, 0, > > dev_name(dev), sdma); > > if (ret) > > - return ret; > > + return dev_err_probe(dev, ret, "Failed to request IRQ\n"); > > > > sdma->irq = irq; > > > > @@ -2330,11 +2330,11 @@ static int sdma_probe(struct platform_device *pdev) > > > > ret = sdma_init(sdma); > > if (ret) > > - return ret; > > + return dev_err_probe(dev, ret, "sdma_init failed\n"); > > > > ret = sdma_event_remap(sdma); > > if (ret) > > - return ret; > > + return dev_err_probe(dev, ret, "sdma_event_remap failed\n"); > > > > if (sdma->drvdata->script_addrs) > > sdma_add_scripts(sdma, sdma->drvdata->script_addrs); > > @@ -2361,18 +2361,14 @@ static int sdma_probe(struct platform_device *pdev) > > platform_set_drvdata(pdev, sdma); > > > > ret = dma_async_device_register(&sdma->dma_device); > > - if (ret) { > > - dev_err(dev, "unable to register\n"); > > - return ret; > > - } > > + if (ret) > > + return dev_err_probe(dev, ret, "unable to register\n"); > > > > devm_add_action_or_reset(dev, sdma_dma_device_unregister_action, sdma); > > > > ret = of_dma_controller_register(np, sdma_xlate, sdma); > > - if (ret) { > > - dev_err(dev, "failed to register controller\n"); > > - return ret; > > - } > > + if (ret) > > + return dev_err_probe(dev, ret, "failed to register controller\n"); > > > > spba_bus = of_find_compatible_node(NULL, NULL, "fsl,spba-bus"); > > ret = of_address_to_resource(spba_bus, 0, &spba_res); > > > > -- > > 2.47.2 > > >
© 2016 - 2025 Red Hat, Inc.