Patchwork [kernel/3.0.35-4.1.0,4/8] ENGR00271136 Fix build break when CONFIG_CLK_DEBUG is disabled

login
register
mail settings
Submitter Otavio Salvador
Date Aug. 30, 2013, 3:50 a.m.
Message ID <1377834634-30465-5-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/57117/
State Awaiting Upstream
Delegated to: Otavio Salvador
Headers show

Comments

Otavio Salvador - Aug. 30, 2013, 3:50 a.m.
From: Mahesh Mahadevan <Mahesh.Mahadevan@freescale.com>

clk structure member name is defined only when CONFIG_CLK_DEBUG is enabled.
Hence need to encapsulate the code with this config.

Patch received from imx community:
https://community.freescale.com/thread/308482

Signed-off-by: xiongweihuang
Signed-off-by: Mahesh Mahadevan <Mahesh.Mahadevan@freescale.com>
---
 arch/arm/plat-mxc/clock.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/arch/arm/plat-mxc/clock.c b/arch/arm/plat-mxc/clock.c
index 93347eb..1aa2664 100755
--- a/arch/arm/plat-mxc/clock.c
+++ b/arch/arm/plat-mxc/clock.c
@@ -58,12 +58,12 @@  static void __clk_disable(struct clk *clk)
 {
 	if (clk == NULL || IS_ERR(clk))
 		return;
-
+#ifdef CONFIG_CLK_DEBUG
 	if (!clk->usecount) {
 		WARN(1, "clock enable/disable mismatch! clk  %s\n", clk->name);
 		return;
 	}
-
+#endif
 	if (!(--clk->usecount)) {
 		if (clk->disable)
 			clk->disable(clk);