code.ossystems Code Review - meta-freescale.git/blob

   1 From d8601292ae25e0af47aa4486055221ab44113f0e Mon Sep 17 00:00:00 2001
   2 From: Mahesh Mahadevan <Mahesh.Mahadevan@freescale.com>
   3 Date: Mon, 15 Jul 2013 15:34:54 -0500
   4 Subject: [PATCH] ENGR00271136 Fix build break when CONFIG_CLK_DEBUG is
   5  disabled
   6 Organization: O.S. Systems Software LTDA.
   7
   8 clk structure member name is defined only when CONFIG_CLK_DEBUG is enabled.
   9 Hence need to encapsulate the code with this config.
  10
  11 Patch received from imx community:
  12 https://community.freescale.com/thread/308482
  13
  14 Upstream-Status: Pending
  15
  16 Signed-off-by: xiongweihuang
  17 Signed-off-by: Mahesh Mahadevan <Mahesh.Mahadevan@freescale.com>
  18 ---
  19  arch/arm/plat-mxc/clock.c | 4 ++--
  20  1 file changed, 2 insertions(+), 2 deletions(-)
  21
  22 diff --git a/arch/arm/plat-mxc/clock.c b/arch/arm/plat-mxc/clock.c
  23 index 93347eb..1aa2664 100755
  24 --- a/arch/arm/plat-mxc/clock.c
  25 +++ b/arch/arm/plat-mxc/clock.c
  26 @@ -58,12 +58,12 @@ static void __clk_disable(struct clk *clk)
  27  {
  28         if (clk == NULL || IS_ERR(clk))
  29                 return;
  30 -
  31 +#ifdef CONFIG_CLK_DEBUG
  32         if (!clk->usecount) {
  33                 WARN(1, "clock enable/disable mismatch! clk  %s\n", clk->name);
  34                 return;
  35         }
  36 -
  37 +#endif
  38         if (!(--clk->usecount)) {
  39                 if (clk->disable)
  40                         clk->disable(clk);
  41 --
  42 1.8.4.rc3
  43