From patchwork Wed Aug 24 17:26:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 9298087 X-Patchwork-Delegate: sboyd@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8AF0E607EE for ; Wed, 24 Aug 2016 17:40:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B2DD290F8 for ; Wed, 24 Aug 2016 17:40:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F67F29100; Wed, 24 Aug 2016 17:40:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE0BE290F8 for ; Wed, 24 Aug 2016 17:40:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753808AbcHXRke (ORCPT ); Wed, 24 Aug 2016 13:40:34 -0400 Received: from condef003-v.nifty.com ([210.131.4.240]:49181 "EHLO condef003-v.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753295AbcHXRkX (ORCPT ); Wed, 24 Aug 2016 13:40:23 -0400 Received: from conuserg-12.nifty.com ([10.26.8.75])by condef003-v.nifty.com with ESMTP id u7OHVw01014000; Thu, 25 Aug 2016 02:31:58 +0900 Received: from grover.sesame (FL1-119-242-215-193.osk.mesh.ad.jp [119.242.215.193]) (authenticated) by conuserg-12.nifty.com with ESMTP id u7OHR1nU023395; Thu, 25 Aug 2016 02:27:04 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com u7OHR1nU023395 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1472059625; bh=4Yy85OpQGJ8YZusk7u04eMv9UZ4mwlBvVpR4E8GCCk4=; h=From:To:Cc:Subject:Date:From; b=N7aZcYhf4B5YOVvSMleMje187W7ZRInAEFsdWlzuF9qzjbnmXDv7WNPUrulQ5Th3+ AGzFrJnjPq29cOYGuaZg7KyTf6fMJ8f0Bpas00hpzyjHcXb8Urt3wb8YuaS5n43ju/ oKDXSGSoDC6KIgJFJg0PF2oM5LfRmcaznSdDZxN3d9nQmjgav5F+G2WSugHR+HuxO4 9TBDGKrcq8V7ATyg3iSW/hhP6jIyFQVw+GpHY5dGEIRbC1ocORWtBr+vp0rv5K45c7 K/CGKuDLozL8nbxh2EDgZANSojFiwtobSe42zf3mEI5jf69RT2Am7Opa+fEiMVC5Ud A6POT6GPd8Ckw== X-Nifty-SrcIP: [119.242.215.193] From: Masahiro Yamada To: linux-clk@vger.kernel.org Cc: Stephen Boyd , Ralf Baechle , Michael Turquette , Masahiro Yamada , linux-mips@linux-mips.org, Haojian Zhuang , Eric Miao , Florian Fainelli , linux-kernel@vger.kernel.org, adi-buildroot-devel@lists.sourceforge.net, Greg Ungerer , linux-m68k@lists.linux-m68k.org, bcm-kernel-feedback-list@broadcom.com, Wan ZongShun , Geert Uytterhoeven , Steven Miao , Russell King , linux-arm-kernel@lists.infradead.org Subject: [PATCH v3] clk: let clk_disable() return immediately if clk is NULL Date: Thu, 25 Aug 2016 02:26:53 +0900 Message-Id: <1472059613-30551-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Many of clk_disable() implementations just return for NULL pointer, but this check is missing from some. Let's make it tree-wide consistent. It will allow clock consumers to call clk_disable() without NULL pointer check. Signed-off-by: Masahiro Yamada Acked-by: Greg Ungerer Acked-by: Wan Zongshun Acked-by: Geert Uytterhoeven Acked-by: Florian Fainelli --- I came back after a long pause. You can see the discussion about the previous version: https://www.linux-mips.org/archives/linux-mips/2016-04/msg00063.html 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-mmp/clock.c | 3 +++ arch/arm/mach-w90x900/clock.c | 3 +++ arch/blackfin/mach-bf609/clock.c | 3 +++ arch/m68k/coldfire/clk.c | 4 ++++ arch/mips/bcm63xx/clk.c | 3 +++ 5 files changed, 16 insertions(+) diff --git a/arch/arm/mach-mmp/clock.c b/arch/arm/mach-mmp/clock.c index ac6633d..28fe64c 100644 --- a/arch/arm/mach-mmp/clock.c +++ b/arch/arm/mach-mmp/clock.c @@ -67,6 +67,9 @@ void clk_disable(struct clk *clk) { unsigned long flags; + if (!clk) + return; + WARN_ON(clk->enabled == 0); spin_lock_irqsave(&clocks_lock, flags); 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); diff --git a/arch/blackfin/mach-bf609/clock.c b/arch/blackfin/mach-bf609/clock.c index 3783058..392a59b 100644 --- a/arch/blackfin/mach-bf609/clock.c +++ b/arch/blackfin/mach-bf609/clock.c @@ -97,6 +97,9 @@ EXPORT_SYMBOL(clk_enable); void clk_disable(struct clk *clk) { + if (!clk) + return; + if (clk->ops && clk->ops->disable) clk->ops->disable(clk); } diff --git a/arch/m68k/coldfire/clk.c b/arch/m68k/coldfire/clk.c index fddfdcc..1e3c7e9 100644 --- a/arch/m68k/coldfire/clk.c +++ b/arch/m68k/coldfire/clk.c @@ -101,6 +101,10 @@ EXPORT_SYMBOL(clk_enable); void clk_disable(struct clk *clk) { unsigned long flags; + + if (!clk) + return; + spin_lock_irqsave(&clk_lock, flags); if ((--clk->enabled == 0) && clk->clk_ops) clk->clk_ops->disable(clk); diff --git a/arch/mips/bcm63xx/clk.c b/arch/mips/bcm63xx/clk.c index 6375652..b49fc9c 100644 --- a/arch/mips/bcm63xx/clk.c +++ b/arch/mips/bcm63xx/clk.c @@ -326,6 +326,9 @@ EXPORT_SYMBOL(clk_enable); void clk_disable(struct clk *clk) { + if (!clk) + return; + mutex_lock(&clocks_mutex); clk_disable_unlocked(clk); mutex_unlock(&clocks_mutex);