From: Amelie Delaunay <amelie.delaunay@st.com>
To: Vinod Koul <vkoul@kernel.org>,
Dan Williams <dan.j.williams@intel.com>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@st.com>
Cc: <dmaengine@vger.kernel.org>,
<linux-stm32@st-md-mailman.stormreply.com>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
Amelie Delaunay <amelie.delaunay@st.com>,
Pierre-Yves MORDRET <pierre-yves.mordret@st.com>
Subject: [PATCH 4/6] dmaengine: stm32-mdma: driver defers probe for clock and reset
Date: Mon, 27 Jan 2020 09:53:32 +0100 [thread overview]
Message-ID: <20200127085334.13163-5-amelie.delaunay@st.com> (raw)
In-Reply-To: <20200127085334.13163-1-amelie.delaunay@st.com>
This patch changes error log when failing to get the clock so that it is
not printed on failure with probe deferring.
It also defers probe when reset controller is expected but has not been
probed yet when MDMA device is probed.
Signed-off-by: Etienne Carriere <etienne.carriere@st.com>
Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com>
---
drivers/dma/stm32-mdma.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/dma/stm32-mdma.c b/drivers/dma/stm32-mdma.c
index f23c82e3990c..2dbd1f38a6f5 100644
--- a/drivers/dma/stm32-mdma.c
+++ b/drivers/dma/stm32-mdma.c
@@ -1579,8 +1579,8 @@ static int stm32_mdma_probe(struct platform_device *pdev)
dmadev->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(dmadev->clk)) {
ret = PTR_ERR(dmadev->clk);
- if (ret == -EPROBE_DEFER)
- dev_info(&pdev->dev, "Missing controller clock\n");
+ if (ret != -EPROBE_DEFER)
+ dev_err(&pdev->dev, "Missing clock controller\n");
return ret;
}
@@ -1591,7 +1591,11 @@ static int stm32_mdma_probe(struct platform_device *pdev)
}
rst = devm_reset_control_get(&pdev->dev, NULL);
- if (!IS_ERR(rst)) {
+ if (IS_ERR(rst)) {
+ ret = PTR_ERR(rst);
+ if (ret == -EPROBE_DEFER)
+ goto err_clk;
+ } else {
reset_control_assert(rst);
udelay(2);
reset_control_deassert(rst);
--
2.17.1
next prev parent reply other threads:[~2020-01-27 8:54 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-27 8:53 [PATCH 0/6] STM32 MDMA driver fixes and improvements Amelie Delaunay
2020-01-27 8:53 ` [PATCH 1/6] dmaengine: stm32-mdma: add suspend/resume power management support Amelie Delaunay
2020-01-27 8:53 ` [PATCH 2/6] dmaengine: stm32-mdma: use reset controller only at probe time Amelie Delaunay
2020-01-27 8:53 ` [PATCH 3/6] dmaengine: stm32-mdma: disable clock in case of error during probe Amelie Delaunay
2020-01-27 8:53 ` Amelie Delaunay [this message]
2020-01-27 8:53 ` [PATCH 5/6] dmaengine: stm32-mdma: enable descriptor_reuse Amelie Delaunay
2020-01-27 8:53 ` [PATCH 6/6] dmaengine: stm32-mdma: use vchan_terminate_vdesc() in .terminate_all Amelie Delaunay
2020-02-24 16:50 ` [PATCH 0/6] STM32 MDMA driver fixes and improvements 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=20200127085334.13163-5-amelie.delaunay@st.com \
--to=amelie.delaunay@st.com \
--cc=alexandre.torgue@st.com \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=pierre-yves.mordret@st.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;
as well as URLs for NNTP newsgroup(s).