clk: Cleanup devm_clk_match() wreckage
Stephen Boyd
maintainerPATCH 1/1 clk: Cleanup devm_clk_match() wreckage
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 <[email protected]>
Cc Uwe Kleine-König <[email protected]>
Signed-off-by Stephen Boyd <[email protected]>
--- drivers/clk/clk-devres.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/clk/clk-devres.c +7 -5
@@ -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
Signature · 2 lines
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/ https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git