diff mbox series

[v5,2/3] ARM: w90x900: let clk_disable() return immediately if clk is NULL

Message ID 1490692624-11931-3-git-send-email-yamada.masahiro@socionext.com
State Accepted
Commit e1ffaa551cfbc5fc86bb6f40d41adb5e5106ab6c
Headers show
Series clk: let clk_disable() return immediately if clk is NULL for last 3 clks | expand

Commit Message

Masahiro Yamada March 28, 2017, 9:17 a.m. UTC 
In many of clk_disable() implementations, it is a no-op for a NULL
pointer input, but this is one of the exceptions.

Making it treewide consistent will allow clock consumers to call
clk_disable() without NULL pointer check.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Acked-by: Wan Zongshun <mcuos.com@gmail.com>

---

Changes in v5: None
Changes in v4:
  - Split into per-arch patches

Changes in v3:
  - Return only when clk is NULL.  Do not take care of error pointer.

Changes in v2:
  - Rebase on Linux 4.6-rc1

 arch/arm/mach-w90x900/clock.c | 3 +++
 1 file changed, 3 insertions(+)

-- 
2.7.4

Comments

Arnd Bergmann March 30, 2017, 3:38 p.m. UTC | #1 
On Tue, Mar 28, 2017 at 11:17 AM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> In many of clk_disable() implementations, it is a no-op for a NULL

> pointer input, but this is one of the exceptions.

>

> Making it treewide consistent will allow clock consumers to call

> clk_disable() without NULL pointer check.

>

> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

> Acked-by: Wan Zongshun <mcuos.com@gmail.com>

> ---


Applied to next/fixes-non-critical in arm-soc, I don't think anybody else
was going to apply it. Thanks!

     Arnd
diff mbox series

Patch

diff --git a/arch/arm/mach-w90x900/clock.c b/arch/arm/mach-w90x900/clock.c
index 2c371ff..ac6fd1a 100644
--- a/arch/arm/mach-w90x900/clock.c
+++ b/arch/arm/mach-w90x900/clock.c
@@ -46,6 +46,9 @@  void clk_disable(struct clk *clk)
 {
 	unsigned long flags;
 
+	if (!clk)
+		return;
+
 	WARN_ON(clk->enabled == 0);
 
 	spin_lock_irqsave(&clocks_lock, flags);