Skip to contentSkip to conversation

clk: ti: Adjustments for eight function implementations

PATCH In review Markus Elfring 4 participants 16 messages Dec 24, 2023 – Feb 20, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover clk: ti: Adjustments for eight function implementations

From: Markus Elfring <[email protected]>
Date: Sun, 24 Dec 2023 17:03:21 +0100

Several update suggestions were taken into account from static source code analysis.

Markus Elfring (10):
Less function calls in of_omap2_apll_setup() after error detection Less function calls in of_dra7_apll_setup() after error detection Use common code in omap_clk_register_apll()
Less function calls in ti_fapll_setup() after error detection One function call less in ti_fapll_synth_setup() after error detection Return directly after a failed kzalloc() in of_mux_clk_setup() Less function calls in _ti_omap4_clkctrl_setup() after error detection Use common error handling code in _ti_omap4_clkctrl_setup() Less function calls in _ti_clkctrl_clk_register() after error detection Delete an unnecessary initialisation in _ti_clkctrl_clk_register()

 drivers/clk/ti/apll.c    | 58 ++++++++++++++++++++++++----------------
 drivers/clk/ti/clkctrl.c | 44 ++++++++++++++++--------------
 drivers/clk/ti/fapll.c   | 29 +++++++++++---------
 drivers/clk/ti/mux.c     |  2 +-
 4 files changed, 76 insertions(+), 57 deletions(-)

--
2.43.0

#1 lore raw

PATCH 1/10 clk: ti: Less function calls in of_omap2_apll_setup() after error detection

From: Markus Elfring <[email protected]>
Date: Sun, 24 Dec 2023 11:15:27 +0100

The kfree() function was called in up to three cases by the of_omap2_apll_setup() function during error handling even if the passed variable contained a null pointer. This issue was detected by using the Coccinelle software.

* Split a condition check.

* Adjust jump targets.

* Delete three initialisations which became unnecessary with this refactoring.

---
 drivers/clk/ti/apll.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)
drivers/clk/ti/apll.c +14 -9
index 93183287c58d..929c021f0cdb 100644
@@ -338,21 +338,25 @@ static const struct clk_hw_omap_ops omap2_apll_hwops = {
 
 static void __init of_omap2_apll_setup(struct device_node *node)
 {
-	struct dpll_data *ad = NULL;
-	struct clk_hw_omap *clk_hw = NULL;
-	struct clk_init_data *init = NULL;
+	struct dpll_data *ad;
+	struct clk_hw_omap *clk_hw;
+	struct clk_init_data *init = kzalloc(sizeof(*init), GFP_KERNEL);
 	const char *name;
 	struct clk *clk;
 	const char *parent_name;
 	u32 val;
 	int ret;
 
-	ad = kzalloc(sizeof(*ad), GFP_KERNEL);
+	if (!init)
+		return;
+
 	clk_hw = kzalloc(sizeof(*clk_hw), GFP_KERNEL);
-	init = kzalloc(sizeof(*init), GFP_KERNEL);
+	if (!clk_hw)
+		goto free_init;
 
-	if (!ad || !clk_hw || !init)
-		goto cleanup;
+	ad = kzalloc(sizeof(*ad), GFP_KERNEL);
+	if (!ad)
+		goto free_clk_hw;
 
 	clk_hw->dpll_data = ad;
 	clk_hw->hw.init = init;
@@ -403,12 +407,13 @@ static void __init of_omap2_apll_setup(struct device_node *node)
 	clk = of_ti_clk_register_omap_hw(node, &clk_hw->hw, name);
 	if (!IS_ERR(clk)) {
 		of_clk_add_provider(node, of_clk_src_simple_get, clk);
-		kfree(init);
-		return;
+		goto free_init;
 	}
 cleanup:
 	kfree(ad);
+free_clk_hw:
 	kfree(clk_hw);
+free_init:
 	kfree(init);
 }
 CLK_OF_DECLARE(omap2_apll_clock, "ti,omap2-apll-clock",

--
2.43.0

#3 lore raw

PATCH 2/10 clk: ti: Less function calls in of_dra7_apll_setup() after error detection

In reply to Markus Elfring

From: Markus Elfring <[email protected]>
Date: Sun, 24 Dec 2023 12:27:09 +0100

The kfree() function was called in up to four cases by the of_dra7_apll_setup() function during error handling even if the passed variable contained a null pointer. This issue was detected by using the Coccinelle software.

* Split a condition check.

* Adjust jump targets.

* Delete four initialisations which became unnecessary with this refactoring.

---
 drivers/clk/ti/apll.c | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)
drivers/clk/ti/apll.c +18 -10
index 929c021f0cdb..d2be672521a3 100644
@@ -177,17 +177,22 @@ static void __init omap_clk_register_apll(void *user,
 
 static void __init of_dra7_apll_setup(struct device_node *node)
 {
-	struct dpll_data *ad = NULL;
-	struct clk_hw_omap *clk_hw = NULL;
-	struct clk_init_data *init = NULL;
-	const char **parent_names = NULL;
+	struct dpll_data *ad;
+	struct clk_hw_omap *clk_hw;
+	struct clk_init_data *init = kzalloc(sizeof(*init), GFP_KERNEL);
+	const char **parent_names;
 	int ret;
 
-	ad = kzalloc(sizeof(*ad), GFP_KERNEL);
+	if (!init)
+		return;
+
 	clk_hw = kzalloc(sizeof(*clk_hw), GFP_KERNEL);
-	init = kzalloc(sizeof(*init), GFP_KERNEL);
-	if (!ad || !clk_hw || !init)
-		goto cleanup;
+	if (!clk_hw)
+		goto free_init;
+
+	ad = kzalloc(sizeof(*ad), GFP_KERNEL);
+	if (!ad)
+		goto free_clk_hw;
 
 	clk_hw->dpll_data = ad;
 	clk_hw->hw.init = init;
@@ -198,12 +203,12 @@ static void __init of_dra7_apll_setup(struct device_node *node)
 	init->num_parents = of_clk_get_parent_count(node);
 	if (init->num_parents < 1) {
 		pr_err("dra7 apll %pOFn must have parent(s)\n", node);
-		goto cleanup;
+		goto free_ad;
 	}
 
 	parent_names = kcalloc(init->num_parents, sizeof(char *), GFP_KERNEL);
 	if (!parent_names)
-		goto cleanup;
+		goto free_ad;
 
 	of_clk_parent_fill(node, parent_names, init->num_parents);
 
@@ -223,8 +228,11 @@ static void __init of_dra7_apll_setup(struct device_node *node)
 
 cleanup:
 	kfree(parent_names);
+free_ad:
 	kfree(ad);
+free_clk_hw:
 	kfree(clk_hw);
+free_init:
 	kfree(init);
 }
 CLK_OF_DECLARE(dra7_apll_clock, "ti,dra7-apll-clock", of_dra7_apll_setup);

--
2.43.0

#4 lore raw

PATCH 3/10 clk: ti: Use common code in omap_clk_register_apll()

In reply to Markus Elfring

From: Markus Elfring <[email protected]>
Date: Sun, 24 Dec 2023 12:40:59 +0100

Use another label so that two function calls can be better reused at the end of this function.

---
 drivers/clk/ti/apll.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/clk/ti/apll.c +3 -4
index d2be672521a3..406326883741 100644
@@ -163,16 +163,15 @@ static void __init omap_clk_register_apll(void *user,
 	clk = of_ti_clk_register_omap_hw(node, &clk_hw->hw, name);
 	if (!IS_ERR(clk)) {
 		of_clk_add_provider(node, of_clk_src_simple_get, clk);
-		kfree(init->parent_names);
-		kfree(init);
-		return;
+		goto free_names;
 	}
 
 cleanup:
 	kfree(clk_hw->dpll_data);
+	kfree(clk_hw);
+free_names:
 	kfree(init->parent_names);
 	kfree(init);
-	kfree(clk_hw);
 }
 
 static void __init of_dra7_apll_setup(struct device_node *node)

--
2.43.0

#5 lore raw

PATCH 4/10 clk: ti: Less function calls in ti_fapll_setup() after error detection

In reply to Markus Elfring

From: Markus Elfring <[email protected]>
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.

---
 drivers/clk/ti/fapll.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)
drivers/clk/ti/fapll.c +14 -12
index 2db3fc4a443e..e9956e3ccd65 100644
@@ -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

#6 lore raw

PATCH 5/10 clk: ti: One function call less in ti_fapll_synth_setup() after error detection

In reply to Markus Elfring

From: Markus Elfring <[email protected]>
Date: Sun, 24 Dec 2023 14:05:41 +0100

The kfree() function was called in one case by the ti_fapll_synth_setup() function during error handling even if the passed variable contained a null pointer. This issue was detected by using the Coccinelle software.

Thus use another label.

---
 drivers/clk/ti/fapll.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/clk/ti/fapll.c +2 -1
index e9956e3ccd65..d4674ec3d7e9 100644
@@ -504,7 +504,7 @@ static struct clk * __init ti_fapll_synth_setup(struct fapll_data *fd,
 
 	synth = kzalloc(sizeof(*synth), GFP_KERNEL);
 	if (!synth)
-		goto free;
+		goto free_init;
 
 	synth->fd = fd;
 	synth->index = index;
@@ -524,6 +524,7 @@ static struct clk * __init ti_fapll_synth_setup(struct fapll_data *fd,
 
 free:
 	kfree(synth);
+free_init:
 	kfree(init);
 
 	return clk;

--
2.43.0

#7 lore raw

PATCH 6/10 clk: ti: Return directly after a failed kzalloc() in of_mux_clk_setup()

In reply to Markus Elfring

From: Markus Elfring <[email protected]>
Date: Sun, 24 Dec 2023 14:20:18 +0100

The kfree() function was called in one case by the of_mux_clk_setup() function during error handling even if the passed variable contained a null pointer. This issue was detected by using the Coccinelle software.

Thus return directly after a call of the function “kzalloc” failed at the beginning.

---
 drivers/clk/ti/mux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/ti/mux.c +1 -1
index 1ebafa386be6..ab1205fa40d6 100644
@@ -182,7 +182,7 @@ static void of_mux_clk_setup(struct device_node *node)
 	}
 	parent_names = kzalloc((sizeof(char *) * num_parents), GFP_KERNEL);
 	if (!parent_names)
-		goto cleanup;
+		return;
 
 	of_clk_parent_fill(node, parent_names, num_parents);
 

--
2.43.0

#8 lore raw

PATCH 7/10 clk: ti: Less function calls in _ti_omap4_clkctrl_setup() after error detection

In reply to Markus Elfring

From: Markus Elfring <[email protected]>
Date: Sun, 24 Dec 2023 15:46:04 +0100

The kfree() function was called in a few cases by the _ti_omap4_clkctrl_setup() function during error handling even if the passed variable contained a null pointer. Thus adjust jump targets.

---
 drivers/clk/ti/clkctrl.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/clk/ti/clkctrl.c +6 -4
index 607e34d8e289..82b48548818b 100644
@@ -681,11 +681,11 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node)
 						   reg_data->offset, 0,
 						   legacy_naming);
 		if (!init.name)
-			goto cleanup;
+			goto free_clkctrl_name;
 
 		clkctrl_clk = kzalloc(sizeof(*clkctrl_clk), GFP_KERNEL);
 		if (!clkctrl_clk)
-			goto cleanup;
+			goto free_init_name;
 
 		init.ops = &omap4_clkctrl_clk_ops;
 		hw->hw.init = &init;
@@ -711,10 +711,12 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node)
 	return;
 
 cleanup:
-	kfree(hw);
+	kfree(clkctrl_clk);
+free_init_name:
 	kfree(init.name);
+free_clkctrl_name:
 	kfree(clkctrl_name);
-	kfree(clkctrl_clk);
+	kfree(hw);
 }
 CLK_OF_DECLARE(ti_omap4_clkctrl_clock, "ti,clkctrl",
 	       _ti_omap4_clkctrl_setup);

--
2.43.0

#9 lore raw

PATCH 8/10 clk: ti: Use common error handling code in _ti_omap4_clkctrl_setup()

In reply to Markus Elfring

From: Markus Elfring <[email protected]>
Date: Sun, 24 Dec 2023 15:56:08 +0100

Add a jump target so that a bit of exception handling can be better reused at the end of this function.

---
 drivers/clk/ti/clkctrl.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)
drivers/clk/ti/clkctrl.c +11 -12
index 82b48548818b..5a1bd176160c 100644
@@ -590,10 +590,9 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node)
 	if (clkctrl_name) {
 		provider->clkdm_name = kasprintf(GFP_KERNEL,
 						 "%s_clkdm", clkctrl_name);
-		if (!provider->clkdm_name) {
-			kfree(provider);
-			return;
-		}
+		if (!provider->clkdm_name)
+			goto free_provider;
+
 		goto clkdm_found;
 	}
 
@@ -603,10 +602,8 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node)
 	 */
 	if (legacy_naming) {
 		provider->clkdm_name = kasprintf(GFP_KERNEL, "%pOFnxxx", node->parent);
-		if (!provider->clkdm_name) {
-			kfree(provider);
-			return;
-		}
+		if (!provider->clkdm_name)
+			goto free_provider;
 
 		/*
 		 * Create default clkdm name, replace _cm from end of parent
@@ -615,10 +612,8 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node)
 		provider->clkdm_name[strlen(provider->clkdm_name) - 2] = 0;
 	} else {
 		provider->clkdm_name = kasprintf(GFP_KERNEL, "%pOFn", node);
-		if (!provider->clkdm_name) {
-			kfree(provider);
-			return;
-		}
+		if (!provider->clkdm_name)
+			goto free_provider;
 
 		/*
 		 * Create default clkdm name, replace _clkctrl from end of
@@ -710,4 +705,8 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node)
 
 	return;
 
+free_provider:
+	kfree(provider);
+	return;
+
 cleanup:

--
2.43.0

#10 lore raw

PATCH 9/10 clk: ti: Less function calls in _ti_clkctrl_clk_register() after error detection

In reply to Markus Elfring

From: Markus Elfring <[email protected]>
Date: Sun, 24 Dec 2023 16:06:34 +0100

The kfree() function was called in a few cases by the of_omap2_apll_setup() function during error handling even if the passed variable contained a null pointer.

* Split a condition check.

* Adjust jump targets.

---
 drivers/clk/ti/clkctrl.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/clk/ti/clkctrl.c +6 -3
index 5a1bd176160c..cdc3cf1ddddf 100644
@@ -296,11 +296,13 @@ _ti_clkctrl_clk_register(struct omap_clkctrl_provider *provider,
 	init.name = clkctrl_get_clock_name(node, clkctrl_name, offset, bit,
 					   ti_clk_get_features()->flags &
 					   TI_CLK_CLKCTRL_COMPAT);
+	if (!init.name)
+		return -ENOMEM;
 
 	clkctrl_clk = kzalloc(sizeof(*clkctrl_clk), GFP_KERNEL);
-	if (!init.name || !clkctrl_clk) {
+	if (!clkctrl_clk) {
 		ret = -ENOMEM;
-		goto cleanup;
+		goto free_init_name;
 	}
 
 	clk_hw->init = &init;
@@ -324,8 +326,9 @@ _ti_clkctrl_clk_register(struct omap_clkctrl_provider *provider,
 	return 0;
 
 cleanup:
-	kfree(init.name);
 	kfree(clkctrl_clk);
+free_init_name;
+	kfree(init.name);
 	return ret;
 }
 

--
2.43.0

#13 lore raw

PATCH 10/10 clk: ti: Delete an unnecessary initialisation in _ti_clkctrl_clk_register()

In reply to Markus Elfring

From: Markus Elfring <[email protected]>
Date: Sun, 24 Dec 2023 16:27:33 +0100

The variable “ret” will eventually be set to an appropriate value a bit later. Thus omit the explicit initialisation at the beginning.

---
 drivers/clk/ti/clkctrl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/ti/clkctrl.c +1 -1
index cdc3cf1ddddf..b9df75c6cc50 100644
@@ -291,7 +291,7 @@ _ti_clkctrl_clk_register(struct omap_clkctrl_provider *provider,
 	struct clk_init_data init = { NULL };
 	struct clk *clk;
 	struct omap_clkctrl_clk *clkctrl_clk;
-	int ret = 0;
+	int ret;
 
 	init.name = clkctrl_get_clock_name(node, clkctrl_name, offset, bit,
 					   ti_clk_get_features()->flags &

--
2.43.0

#2 lore raw

Re: [PATCH 01/10] clk: ti: Less function calls in of_omap2_apll_setup() after error detection

In reply to Markus Elfring
Quoted 8 lines · Markus Elfring

From: Markus Elfring <[email protected]>
Date: Sun, 24 Dec 2023 11:15:27 +0100

The kfree() function was called in up to three cases by the of_omap2_apll_setup() function during error handling even if the passed variable contained a null pointer. This issue was detected by using the Coccinelle software.

Quoted 6 lines

* Split a condition check.

* Adjust jump targets.

* Delete three initialisations which became unnecessary with this refactoring.

Instead, make use of cleanup.h.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#14 lore raw
In reply to Markus Elfring
Quoted 5 lines · Markus Elfring

From: Markus Elfring <[email protected]>
Date: Sun, 24 Dec 2023 17:03:21 +0100

Several update suggestions were taken into account from static source code analysis.

Unneeded churn, if you want to make it better, switch the code to use cleanup.h.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#11 lore raw

Re: [PATCH 09/10] clk: ti: Less function calls in _ti_clkctrl_clk_register() after error detection

In reply to Markus Elfring
kernel test robot noticed the following build errors:

Hi Markus,

kernel test robot noticed the following build errors:

[auto build test ERROR on clk/clk-next]
[also build test ERROR on linus/master v6.7-rc7 next-20231222] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Markus-Elfring/clk-ti-Less-function-calls-in-of_omap2_apll_setup-after-error-detection/20231225-152410
base:   https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next
patch link:    https://lore.kernel.org/r/b11039e4-69c6-4247-b4ba-c442b9427231%40web.de
patch subject: [PATCH 09/10] clk: ti: Less function calls in _ti_clkctrl_clk_register() after error detection
config: arm-allmodconfig (https://download.01.org/0day-ci/archive/20231228/[email protected]/config)
compiler: arm-linux-gnueabi-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231228/[email protected]/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/

All errors (new ones prefixed by >>):

drivers/clk/ti/clkctrl.c: In function '_ti_clkctrl_clk_register':

>> drivers/clk/ti/clkctrl.c:330:1: error: 'free_init_name' undeclared (first use in this function)
     330 | free_init_name;
         | ^~~~~~~~~~~~~~
   drivers/clk/ti/clkctrl.c:330:1: note: each undeclared identifier is reported only once for each function it appears in
>> drivers/clk/ti/clkctrl.c:305:17: error: label 'free_init_name' used but not defined
     305 |                 goto free_init_name;
         |                 ^~~~

vim +/free_init_name +330 drivers/clk/ti/clkctrl.c

283
284 static int __init
285 _ti_clkctrl_clk_register(struct omap_clkctrl_provider *provider,
286 struct device_node *node, struct clk_hw *clk_hw,
287 u16 offset, u8 bit, const char * const *parents,
288 int num_parents, const struct clk_ops *ops,
289 const char *clkctrl_name)
290 {
291 struct clk_init_data init = { NULL };
292 struct clk *clk;
293 struct omap_clkctrl_clk *clkctrl_clk;
294 int ret = 0;
295
296 init.name = clkctrl_get_clock_name(node, clkctrl_name, offset, bit,
297 ti_clk_get_features()->flags &
298 TI_CLK_CLKCTRL_COMPAT);
299 if (!init.name)
300 return -ENOMEM;
301
302 clkctrl_clk = kzalloc(sizeof(*clkctrl_clk), GFP_KERNEL);
303 if (!clkctrl_clk) {
304 ret = -ENOMEM;

 > 305			goto free_init_name;
   306		}
   307	
   308		clk_hw->init = &init;
   309		init.parent_names = parents;
   310		init.num_parents = num_parents;
   311		init.ops = ops;
   312		init.flags = 0;
   313	
   314		clk = of_ti_clk_register(node, clk_hw, init.name);
   315		if (IS_ERR_OR_NULL(clk)) {
   316			ret = -EINVAL;
   317			goto cleanup;
   318		}
   319	
   320		clkctrl_clk->reg_offset = offset;
   321		clkctrl_clk->bit_offset = bit;
   322		clkctrl_clk->clk = clk_hw;
   323	
   324		list_add(&clkctrl_clk->node, &provider->clocks);
   325	
   326		return 0;
   327	
   328	cleanup:
   329		kfree(clkctrl_clk);
 > 330	free_init_name;

331 kfree(init.name);
332 return ret;
333 }
334

Signature · 2 lines
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
#12 lore raw

Re: [09/10] clk: ti: Less function calls in _ti_clkctrl_clk_register() after error detection

…

Quoted 2 lines

drivers/clk/ti/clkctrl.c: In function '_ti_clkctrl_clk_register':

Quoted 1 line
Quoted 1 line

drivers/clk/ti/clkctrl.c:330:1: error: 'free_init_name' undeclared (first use in this function)

…

Quoted 5 lines
   328	cleanup:
   329		kfree(clkctrl_clk);
Quoted 1 line

330 free_init_name;

   331		kfree(init.name);
   332		return ret;

…

Will it become helpful to fix a typo for the delimiter of the shown label?

Or:

Are you looking for further adjustments according to software design options which would be supported by the file “cleanup.h”?
https://elixir.bootlin.com/linux/v6.7-rc7/source/include/linux/cleanup.h

Regards,
Markus

#15 lore raw
In reply to Andy Shevchenko
Quoted 9 lines · Andy Shevchenko
Quoted 5 lines · Markus Elfring

From: Markus Elfring <[email protected]>
Date: Sun, 24 Dec 2023 17:03:21 +0100

Several update suggestions were taken into account from static source code analysis.

Unneeded churn, if you want to make it better, switch the code to use cleanup.h.

Yes cleanup.h sounds good to me too.

Regards,

Tony