mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH] clk: have clk_get always return -ENOENT on missing clock
Date: Mon, 18 Sep 2023 19:04:58 +0200	[thread overview]
Message-ID: <20230918170458.121957-1-a.fatoum@pengutronix.de> (raw)

Currently, clk_get(dev, NULL) returns -ENOENT on missing clock, but 
clk_get(dev, "missing-named-clock") returns -EINVAL. This went by unnoticed
so far as most consumers either require a clock or don't, but with the
addition of clk_get_optional, it's important that clk_get() return value
is uniform.

Therefore align clk_get with Linux and always fall through to clk_get_sys()
if getting clock over DT is not possible. Failing clk_get_sys() returns
-ENOENT always, ensuring we can't end up with -EINVAL as before while
keeping of_clk_get_by_name return value as it is under Linux.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
Please order before commit ("clk: implement clk_get_optional helper")
currently 8b013ac8ec69 in next.
---
 drivers/clk/clkdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c
index 68c6ac36a0c8..dbe998b6af35 100644
--- a/drivers/clk/clkdev.c
+++ b/drivers/clk/clkdev.c
@@ -176,9 +176,9 @@ struct clk *clk_get(struct device *dev, const char *con_id)
 	if (!IS_ERR(clk))
 		return clk;
 
-	if (dev) {
+	if (dev && dev->of_node) {
 		clk = of_clk_get_by_name(dev->of_node, con_id);
-		if (!IS_ERR(clk) || PTR_ERR(clk) != -ENOENT)
+		if (!IS_ERR(clk) || PTR_ERR(clk) == -EPROBE_DEFER)
 			return clk;
 	}
 
-- 
2.39.2




             reply	other threads:[~2023-09-18 17:06 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-18 17:04 Ahmad Fatoum [this message]
2023-09-21  8:02 ` Sascha Hauer

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=20230918170458.121957-1-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.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