From: Sarangdhar Joshi <spjoshi@codeaurora.org>
To: Andy Gross <andy.gross@linaro.org>, David Brown <david.brown@linaro.org>
Cc: Sarangdhar Joshi <spjoshi@codeaurora.org>,
linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org,
linux-kernel@vger.kernel.org,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Jordan Crouse <jcrouse@codeaurora.org>,
Stephen Boyd <sboyd@codeaurora.org>,
Trilok Soni <tsoni@codeaurora.org>
Subject: [PATCH v2 3/3] firmware: qcom: scm: Return PTR_ERR when devm_clk_get fails
Date: Thu, 3 Nov 2016 17:10:37 -0700 [thread overview]
Message-ID: <1478218237-1737-4-git-send-email-spjoshi@codeaurora.org> (raw)
In-Reply-To: <1478218237-1737-1-git-send-email-spjoshi@codeaurora.org>
When devm_clk_get fails for core clock, the failure was ignored
and the core_clk was explicitly set to NULL so that other
remaining clocks can be queried. However, now that we have a
cleaner way of expressing the clock dependency, return failure
when devm_clk_get fails for core clock.
Signed-off-by: Sarangdhar Joshi <spjoshi@codeaurora.org>
---
drivers/firmware/qcom_scm.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
index 844e90d..0321a26 100644
--- a/drivers/firmware/qcom_scm.c
+++ b/drivers/firmware/qcom_scm.c
@@ -395,10 +395,10 @@ static int qcom_scm_probe(struct platform_device *pdev)
if (clks & SCM_HAS_CORE_CLK) {
scm->core_clk = devm_clk_get(&pdev->dev, "core");
if (IS_ERR(scm->core_clk)) {
- if (PTR_ERR(scm->core_clk) == -EPROBE_DEFER)
- return PTR_ERR(scm->core_clk);
-
- scm->core_clk = NULL;
+ if (PTR_ERR(scm->core_clk) != -EPROBE_DEFER)
+ dev_err(&pdev->dev,
+ "failed to acquire core clk\n");
+ return PTR_ERR(scm->core_clk);
}
}
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2016-11-04 0:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-04 0:10 [PATCH v2 0/3] Remove clocks dependency from SCM driver Sarangdhar Joshi
2016-11-04 0:10 ` [PATCH v2 1/3] dt-bindings: firmware: scm: Add MSM8996 DT bindings Sarangdhar Joshi
2016-11-10 1:49 ` Stephen Boyd
2016-11-04 0:10 ` [PATCH v2 2/3] firmware: qcom: scm: Remove core, iface and bus clocks dependency Sarangdhar Joshi
2016-11-10 1:47 ` Stephen Boyd
2016-11-10 5:55 ` Bjorn Andersson
2016-11-10 23:17 ` Stephen Boyd
2016-11-11 22:07 ` Sarangdhar Joshi
2016-11-11 21:59 ` Sarangdhar Joshi
2016-11-04 0:10 ` Sarangdhar Joshi [this message]
2016-11-10 1:49 ` [PATCH v2 3/3] firmware: qcom: scm: Return PTR_ERR when devm_clk_get fails Stephen Boyd
2016-11-11 21:30 ` Sarangdhar Joshi
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=1478218237-1737-4-git-send-email-spjoshi@codeaurora.org \
--to=spjoshi@codeaurora.org \
--cc=andy.gross@linaro.org \
--cc=bjorn.andersson@linaro.org \
--cc=david.brown@linaro.org \
--cc=jcrouse@codeaurora.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-soc@vger.kernel.org \
--cc=sboyd@codeaurora.org \
--cc=tsoni@codeaurora.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).