bus: ti-sysc: Adjust exception handling in sysc_child_add_named_clock()

Commit Message

Markus Elfring Nov. 6, 2019, 6:22 p.m. UTC

From: Markus Elfring <[e-mail]>
Date: Wed, 6 Nov 2019 19:12:30 +0100

Add a jump target so that a call of the function “clk_put”
can be better reused at the end of this function.

Signed-off-by: Markus Elfring <[e-mail]>
---
 drivers/bus/ti-sysc.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--
2.24.0

Comments

Tony Lindgren Nov. 14, 2019, 5:07 p.m. UTC | #1

* Markus Elfring <[e-mail]> [191106 10:22]:
> From: Markus Elfring <[e-mail]>
> Date: Wed, 6 Nov 2019 19:12:30 +0100
> 
> Add a jump target so that a call of the function “clk_put”
> can be better reused at the end of this function.

Thanks applying into omap-for-v5.5/ti-sysc.

Regards,

Tony

Patch

diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index 97b85493aa43..2042f6e45163 100644
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -1766,9 +1766,8 @@  static int sysc_child_add_named_clock(struct sysc *ddata,

 	clk = clk_get(child, name);
 	if (!IS_ERR(clk)) {
-		clk_put(clk);
-
-		return -EEXIST;
+		error = -EEXIST;
+		goto put_clk;
 	}

 	clk = clk_get(ddata->dev, name);
@@ -1778,7 +1777,7 @@  static int sysc_child_add_named_clock(struct sysc *ddata,
 	l = clkdev_create(clk, name, dev_name(child));
 	if (!l)
 		error = -ENOMEM;
-
+put_clk:
 	clk_put(clk);

 	return error;