public inbox for linux-clk@vger.kernel.org
 help / color / mirror / Atom feed
From: Heiner Kallweit <hkallweit1@gmail.com>
To: Michael Turquette <mturquette@baylibre.com>,
	Stephen Boyd <sboyd@kernel.org>
Cc: linux-clk@vger.kernel.org
Subject: [PATCH] clk: mux: let clk_mux_val_to_index return U8_MAX in the error case
Date: Wed, 12 Apr 2023 08:19:04 +0200	[thread overview]
Message-ID: <af85927b-0da3-3495-2ed4-64bda91cd239@gmail.com> (raw)

Currently this function may return a negative errno, but almost no
user checks for the error case. Only imx_clk_gpr_mux_get_parent()
does, but mentions in a comment that they'd prefer a dummy value.
Other users cast the negative errno to u8 instead, what may result
in unwanted results.
Let's deal with this by returning u8 and U8_MAX in the error case.
Then clk_core_get_parent_by_index() can detect that the index is
out of range.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/clk/clk-mux.c        | 8 ++++----
 include/linux/clk-provider.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
index fa817c317..be0f317ee 100644
--- a/drivers/clk/clk-mux.c
+++ b/drivers/clk/clk-mux.c
@@ -40,8 +40,8 @@ static inline void clk_mux_writel(struct clk_mux *mux, u32 val)
 		writel(val, mux->reg);
 }
 
-int clk_mux_val_to_index(struct clk_hw *hw, const u32 *table, unsigned int flags,
-			 unsigned int val)
+u8 clk_mux_val_to_index(struct clk_hw *hw, const u32 *table, unsigned int flags,
+			unsigned int val)
 {
 	int num_parents = clk_hw_get_num_parents(hw);
 
@@ -51,7 +51,7 @@ int clk_mux_val_to_index(struct clk_hw *hw, const u32 *table, unsigned int flags
 		for (i = 0; i < num_parents; i++)
 			if (table[i] == val)
 				return i;
-		return -EINVAL;
+		return U8_MAX;
 	}
 
 	if (val && (flags & CLK_MUX_INDEX_BIT))
@@ -61,7 +61,7 @@ int clk_mux_val_to_index(struct clk_hw *hw, const u32 *table, unsigned int flags
 		val--;
 
 	if (val >= num_parents)
-		return -EINVAL;
+		return U8_MAX;
 
 	return val;
 }
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index faad3cdc1..62fb4118c 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -1069,8 +1069,8 @@ struct clk *clk_register_mux_table(struct device *dev, const char *name,
 			      NULL, (parent_data), (flags), (reg), (shift),   \
 			      BIT((width)) - 1, (clk_mux_flags), table, (lock))
 
-int clk_mux_val_to_index(struct clk_hw *hw, const u32 *table, unsigned int flags,
-			 unsigned int val);
+u8 clk_mux_val_to_index(struct clk_hw *hw, const u32 *table, unsigned int flags,
+			unsigned int val);
 unsigned int clk_mux_index_to_val(const u32 *table, unsigned int flags, u8 index);
 
 void clk_unregister_mux(struct clk *clk);
-- 
2.40.0


             reply	other threads:[~2023-04-12  6:19 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-12  6:19 Heiner Kallweit [this message]
2023-04-13 19:10 ` [PATCH] clk: mux: let clk_mux_val_to_index return U8_MAX in the error case Stephen Boyd
2023-04-13 19:27   ` Heiner Kallweit
2023-04-13 20:30     ` Stephen Boyd
2023-04-13 20:47       ` Heiner Kallweit

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=af85927b-0da3-3495-2ed4-64bda91cd239@gmail.com \
    --to=hkallweit1@gmail.com \
    --cc=linux-clk@vger.kernel.org \
    --cc=mturquette@baylibre.com \
    --cc=sboyd@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