[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <ee5499f6-e06f-4b6a-9483-b73646660117@web.de>
Date: Sun, 24 Dec 2023 17:42:19 +0100
From: Markus Elfring <Markus.Elfring@....de>
To: linux-omap@...r.kernel.org, linux-clk@...r.kernel.org,
kernel-janitors@...r.kernel.org,
Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
Claudiu Beznea <claudiu.beznea@...on.dev>,
Michael Turquette <mturquette@...libre.com>, Rob Herring <robh@...nel.org>,
Stephen Boyd <sboyd@...nel.org>, Tero Kristo <kristo@...nel.org>,
Tony Lindgren <tony@...mide.com>
Cc: LKML <linux-kernel@...r.kernel.org>, cocci@...ia.fr
Subject: [PATCH 04/10] clk: ti: Less function calls in ti_fapll_setup() after
error detection
From: Markus Elfring <elfring@...rs.sourceforge.net>
Date: Sun, 24 Dec 2023 13:55:44 +0100
The kfree() function was called in some cases by
the ti_fapll_setup() function during error handling
even if the passed variable contained a null pointer.
* Adjust jump targets.
* Delete two condition checks which became unnecessary
with this refactoring.
Signed-off-by: Markus Elfring <elfring@...rs.sourceforge.net>
---
drivers/clk/ti/fapll.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/drivers/clk/ti/fapll.c b/drivers/clk/ti/fapll.c
index 2db3fc4a443e..e9956e3ccd65 100644
--- a/drivers/clk/ti/fapll.c
+++ b/drivers/clk/ti/fapll.c
@@ -546,11 +546,11 @@ static void __init ti_fapll_setup(struct device_node *node)
MAX_FAPLL_OUTPUTS + 1,
GFP_KERNEL);
if (!fd->outputs.clks)
- goto free;
+ goto free_fd;
init = kzalloc(sizeof(*init), GFP_KERNEL);
if (!init)
- goto free;
+ goto free_clks;
init->ops = &ti_fapll_ops;
name = ti_dt_clk_name(node);
@@ -559,7 +559,7 @@ static void __init ti_fapll_setup(struct device_node *node)
init->num_parents = of_clk_get_parent_count(node);
if (init->num_parents != 2) {
pr_err("%pOFn must have two parents\n", node);
- goto free;
+ goto free_init;
}
of_clk_parent_fill(node, parent_name, 2);
@@ -568,19 +568,19 @@ static void __init ti_fapll_setup(struct device_node *node)
fd->clk_ref = of_clk_get(node, 0);
if (IS_ERR(fd->clk_ref)) {
pr_err("%pOFn could not get clk_ref\n", node);
- goto free;
+ goto free_init;
}
fd->clk_bypass = of_clk_get(node, 1);
if (IS_ERR(fd->clk_bypass)) {
pr_err("%pOFn could not get clk_bypass\n", node);
- goto free;
+ goto put_clk_ref;
}
fd->base = of_iomap(node, 0);
if (!fd->base) {
pr_err("%pOFn could not get IO base\n", node);
- goto free;
+ goto put_clk_bypass;
}
if (fapll_is_ddr_pll(fd->base))
@@ -653,14 +653,16 @@ static void __init ti_fapll_setup(struct device_node *node)
unmap:
iounmap(fd->base);
-free:
- if (fd->clk_bypass)
- clk_put(fd->clk_bypass);
- if (fd->clk_ref)
- clk_put(fd->clk_ref);
+put_clk_bypass:
+ clk_put(fd->clk_bypass);
+put_clk_ref:
+ clk_put(fd->clk_ref);
+free_init:
+ kfree(init);
+free_clks:
kfree(fd->outputs.clks);
+free_fd:
kfree(fd);
- kfree(init);
}
CLK_OF_DECLARE(ti_fapll_clock, "ti,dm816-fapll-clock", ti_fapll_setup);
--
2.43.0
Powered by blists - more mailing lists