[PATCH] clk: Cleanup devm_clk_match() wreckage

Stephen Boyd
2023-08-22T22:52:51Z

The 'res' pointer passed to devm_clk_match() is a pointer to struct
devm_clk_state after commit abae8e57e49a ("clk: generalize
devm_clk_get() a bit"). Update the logic here to convert the void
pointer to the right type so that this is cleaner. Note that this
doesn't actually change anything due to how struct devm_clk_state is
defined to have a struct clk pointer as the first member.

Given we're cleaning things up, split the WARN_ON() into two different
conditions to provide clarity about which condition is false. Also move
the WARN_ON to the conditional so that the compiler is hinted that all
this code is unlikely().

Cc: Andrey Skvortsov <andrej.skvortzov@gmail.com>
Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
---
drivers/clk/clk-devres.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/clk/clk-devres.c b/drivers/clk/clk-devres.c
index 737aa70e2cb3..979562ee79ba 100644
--- a/drivers/clk/clk-devres.c
+++ b/drivers/clk/clk-devres.c
@@ -184,12 +184,14 @@ EXPORT_SYMBOL_GPL(devm_clk_bulk_get_all);

static int devm_clk_match(struct device *dev, void *res, void *data)
{
- struct clk **c = res;
- if (!c || !*c) {
- WARN_ON(!c || !*c);
+ struct devm_clk_state *state = res;
+
+ if (WARN_ON(!state))
return 0;
- }
- return *c == data;
+ if (WARN_ON(!state->clk))
+ return 0;
+
+ return state->clk == data;
}

void devm_clk_put(struct device *dev, struct clk *clk)

base-commit: 66fbfb35da47f391bdadf9fa7ceb88af4faa9022
--