From: Michael Tretter <m.tretter@pengutronix.de>
To: vkoul@kernel.org, dmaengine@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org,
appana.durga.rao@xilinx.com, michal.simek@xilinx.com,
m.tretter@pengutronix.de, kernel@pengutronix.de
Subject: [PATCH 1/7] dmaengine: zynqmp_dma: simplify with dev_err_probe
Date: Thu, 26 Aug 2021 11:47:36 +0200 [thread overview]
Message-ID: <20210826094742.1302009-2-m.tretter@pengutronix.de> (raw)
In-Reply-To: <20210826094742.1302009-1-m.tretter@pengutronix.de>
The clocks are provided by the ZynqMP firmware driver and are deferred
until the firmware driver has probed. This leads to misleading error
messages during probe of the zynqmp_dma driver.
Use dev_err_probe for printing errors during probe to avoid error
messages for -EPROBE_DEFER.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
drivers/dma/xilinx/zynqmp_dma.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/drivers/dma/xilinx/zynqmp_dma.c b/drivers/dma/xilinx/zynqmp_dma.c
index 5fecf5aa6e85..8423fbfc20c7 100644
--- a/drivers/dma/xilinx/zynqmp_dma.c
+++ b/drivers/dma/xilinx/zynqmp_dma.c
@@ -1062,16 +1062,14 @@ static int zynqmp_dma_probe(struct platform_device *pdev)
p->dev = &pdev->dev;
zdev->clk_main = devm_clk_get(&pdev->dev, "clk_main");
- if (IS_ERR(zdev->clk_main)) {
- dev_err(&pdev->dev, "main clock not found.\n");
- return PTR_ERR(zdev->clk_main);
- }
+ if (IS_ERR(zdev->clk_main))
+ return dev_err_probe(&pdev->dev, PTR_ERR(zdev->clk_main),
+ "main clock not found.\n");
zdev->clk_apb = devm_clk_get(&pdev->dev, "clk_apb");
- if (IS_ERR(zdev->clk_apb)) {
- dev_err(&pdev->dev, "apb clock not found.\n");
- return PTR_ERR(zdev->clk_apb);
- }
+ if (IS_ERR(zdev->clk_apb))
+ return dev_err_probe(&pdev->dev, PTR_ERR(zdev->clk_apb),
+ "apb clock not found.\n");
platform_set_drvdata(pdev, zdev);
pm_runtime_set_autosuspend_delay(zdev->dev, ZDMA_PM_TIMEOUT);
@@ -1086,7 +1084,7 @@ static int zynqmp_dma_probe(struct platform_device *pdev)
ret = zynqmp_dma_chan_probe(zdev, pdev);
if (ret) {
- dev_err(&pdev->dev, "Probing channel failed\n");
+ dev_err_probe(&pdev->dev, ret, "Probing channel failed\n");
goto err_disable_pm;
}
@@ -1098,7 +1096,7 @@ static int zynqmp_dma_probe(struct platform_device *pdev)
ret = of_dma_controller_register(pdev->dev.of_node,
of_zynqmp_dma_xlate, zdev);
if (ret) {
- dev_err(&pdev->dev, "Unable to register DMA to DT\n");
+ dev_err_probe(&pdev->dev, ret, "Unable to register DMA to DT\n");
dma_async_device_unregister(&zdev->common);
goto free_chan_resources;
}
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-08-26 9:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-26 9:47 [PATCH 0/7] dmaengine: zynqmp_dma: fix lockdep warning and cleanup Michael Tretter
2021-08-26 9:47 ` Michael Tretter [this message]
2021-08-26 9:47 ` [PATCH 2/7] dmaengine: zynqmp_dma: drop message on probe success Michael Tretter
2021-08-26 9:47 ` [PATCH 3/7] dmaengine: zynqmp_dma: enable COMPILE_TEST Michael Tretter
2021-08-26 9:47 ` [PATCH 4/7] dmaengine: zynqmp_dma: cleanup includes Michael Tretter
2021-08-26 9:47 ` [PATCH 5/7] dmaengine: zynqmp_dma: cleanup after completing all descriptors Michael Tretter
2021-08-26 9:47 ` [PATCH 6/7] dmaengine: zynqmp_dma: refine dma descriptor locking Michael Tretter
2021-08-26 9:47 ` [PATCH 7/7] dmaengine: zynqmp_dma: fix lockdep warning in tasklet Michael Tretter
2021-10-01 8:56 ` [PATCH 0/7] dmaengine: zynqmp_dma: fix lockdep warning and cleanup Michael Tretter
2021-10-01 11:56 ` Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210826094742.1302009-2-m.tretter@pengutronix.de \
--to=m.tretter@pengutronix.de \
--cc=appana.durga.rao@xilinx.com \
--cc=dmaengine@vger.kernel.org \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=michal.simek@xilinx.com \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox