drivers/clk/clk.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
Linux style is to handle early-on failure. Inverting the first
condition lets us simplify the second, and improves readability.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
drivers/clk/clk.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 47093cda9df32223..1a73e9c4e752a85c 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -3259,11 +3259,10 @@ bool clk_is_match(const struct clk *p, const struct clk *q)
return true;
/* true if clk->core pointers match. Avoid dereferencing garbage */
- if (!IS_ERR_OR_NULL(p) && !IS_ERR_OR_NULL(q))
- if (p->core == q->core)
- return true;
+ if (IS_ERR_OR_NULL(p) || IS_ERR_OR_NULL(q))
+ return false;
- return false;
+ return p->core == q->core;
}
EXPORT_SYMBOL_GPL(clk_is_match);
--
2.43.0
Quoting Geert Uytterhoeven (2026-03-05 02:12:33) > Linux style is to handle early-on failure. Inverting the first > condition lets us simplify the second, and improves readability. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- Applied to clk-next
On Thu, Mar 05, 2026 at 11:12:33AM +0100, Geert Uytterhoeven wrote: > Linux style is to handle early-on failure. Inverting the first > condition lets us simplify the second, and improves readability. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Brian Masney <bmasney@redhat.com> Stephen: There are 8 places in clk_test.c where clk_is_match() is called, so I feel we should be good testing coverage wise.
© 2016 - 2026 Red Hat, Inc.