[PATCH] clk: Call clk_core_enable_lock variant when lock is needed

[PATCH] clk: Call clk_core_enable_lock variant when lock is needed

[Abel Vesa]

Instead of locking explicitly every time, call the clk_core_enable_lock
variant.

Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
---
 drivers/clk/clk.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 5052541..fd37773 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -2078,12 +2078,8 @@ static void clk_change_rate(struct clk_core *core)
 		return;
 
 	if (core->flags & CLK_SET_RATE_UNGATE) {
-		unsigned long flags;
-
 		clk_core_prepare(core);
-		flags = clk_enable_lock();
-		clk_core_enable(core);
-		clk_enable_unlock(flags);
+		clk_core_enable_lock(core);
 	}
 
 	if (core->new_parent && core->new_parent != core->parent) {
@@ -3564,8 +3560,6 @@ static int __clk_core_init(struct clk_core *core)
 	 * reparenting clocks
 	 */
 	if (core->flags & CLK_IS_CRITICAL) {
-		unsigned long flags;
-
 		ret = clk_core_prepare(core);
 		if (ret) {
 			pr_warn("%s: critical clk '%s' failed to prepare\n",
@@ -3573,9 +3567,7 @@ static int __clk_core_init(struct clk_core *core)
 			goto out;
 		}
 
-		flags = clk_enable_lock();
-		ret = clk_core_enable(core);
-		clk_enable_unlock(flags);
+		ret = clk_core_enable_lock(core);
 		if (ret) {
 			pr_warn("%s: critical clk '%s' failed to enable\n",
 			       __func__, core->name);
-- 
2.7.4

Re: [PATCH] clk: Call clk_core_enable_lock variant when lock is needed

[Stephen Boyd]

Quoting Abel Vesa (2021-03-07 10:52:08)
> Instead of locking explicitly every time, call the clk_core_enable_lock
> variant.
> 
> Signed-off-by: Abel Vesa <abel.vesa@nxp.com>

This is done by 

https://lore.kernel.org/r/20210305003334.575831-1-linux@rasmusvillemoes.dk