[PATCH 6/7] ARM: davinci: fix a problematic usage of WARN()

[PATCH 6/7] ARM: davinci: fix a problematic usage of WARN()

[Geliang Tang]

WARN() takes a condition and a format string. The condition was
omitted. So I added it.

Signed-off-by: Geliang Tang <geliangtang@163.com>
---
 arch/arm/mach-davinci/board-dm355-evm.c     | 2 +-
 arch/arm/mach-davinci/board-dm355-leopard.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index c71dd99..e47f24c 100644
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -385,7 +385,7 @@ static __init void dm355_evm_init(void)
 
 	aemif = clk_get(&dm355evm_dm9000.dev, "aemif");
 	if (IS_ERR(aemif))
-		WARN("%s: unable to get AEMIF clock\n", __func__);
+		WARN(1, "%s: unable to get AEMIF clock\n", __func__);
 	else
 		clk_prepare_enable(aemif);
 
diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c
index 680a7a2..83b625c 100644
--- a/arch/arm/mach-davinci/board-dm355-leopard.c
+++ b/arch/arm/mach-davinci/board-dm355-leopard.c
@@ -243,7 +243,7 @@ static __init void dm355_leopard_init(void)
 
 	aemif = clk_get(&dm355leopard_dm9000.dev, "aemif");
 	if (IS_ERR(aemif))
-		WARN("%s: unable to get AEMIF clock\n", __func__);
+		WARN(1, "%s: unable to get AEMIF clock\n", __func__);
 	else
 		clk_prepare_enable(aemif);
 
-- 
2.5.0

[PATCH 6/7] ARM: davinci: fix a problematic usage of WARN()

[Arnd Bergmann]

On Wednesday 25 November 2015 21:12:19 Geliang Tang wrote:
> +++ b/arch/arm/mach-davinci/board-dm355-evm.c
> @@ -385,7 +385,7 @@ static __init void dm355_evm_init(void)
>  
>         aemif = clk_get(&dm355evm_dm9000.dev, "aemif");
>         if (IS_ERR(aemif))
> -               WARN("%s: unable to get AEMIF clock\n", __func__);
> +               WARN(1, "%s: unable to get AEMIF clock\n", __func__);
>         else
>                 clk_prepare_enable(aemif);
>  
> 

How about writing this as 

	if (!WARN(IS_ERR(aemif)), "unable to get AEMIF clock\n"))
		clk_prepare_enable(aemif);

Note that WARN() already contains file and line, so you don't really
need the __func__ here either.

	Arnd

[PATCH v2] ARM: davinci: fix a problematic usage of WARN()

[Geliang Tang]

WARN() takes a condition and a format string. The condition was
omitted. So I added it.

Signed-off-by: Geliang Tang <geliangtang@163.com>
---
Changes in v2:
 - remove __func__ in WARN()
---
 arch/arm/mach-davinci/board-dm355-evm.c     | 4 +---
 arch/arm/mach-davinci/board-dm355-leopard.c | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index c71dd99..3c79796 100644
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -384,9 +384,7 @@ static __init void dm355_evm_init(void)
 	dm355evm_dm9000_rsrc[2].start = gpio_to_irq(1);
 
 	aemif = clk_get(&dm355evm_dm9000.dev, "aemif");
-	if (IS_ERR(aemif))
-		WARN("%s: unable to get AEMIF clock\n", __func__);
-	else
+	if (!WARN(IS_ERR(aemif)), "unable to get AEMIF clock\n"))
 		clk_prepare_enable(aemif);
 
 	platform_add_devices(davinci_evm_devices,
diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c
index 680a7a2..627ba89 100644
--- a/arch/arm/mach-davinci/board-dm355-leopard.c
+++ b/arch/arm/mach-davinci/board-dm355-leopard.c
@@ -242,9 +242,7 @@ static __init void dm355_leopard_init(void)
 	dm355leopard_dm9000_rsrc[2].start = gpio_to_irq(9);
 
 	aemif = clk_get(&dm355leopard_dm9000.dev, "aemif");
-	if (IS_ERR(aemif))
-		WARN("%s: unable to get AEMIF clock\n", __func__);
-	else
+	if (!WARN(IS_ERR(aemif)), "unable to get AEMIF clock\n"))
 		clk_prepare_enable(aemif);
 
 	platform_add_devices(davinci_leopard_devices,
-- 
2.5.0

[PATCH v2] ARM: davinci: fix a problematic usage of WARN()

[kbuild test robot]

Hi Geliang,

[auto build test ERROR on arm-soc/for-next]
[also build test ERROR on v4.4-rc2 next-20151124]

url:    https://github.com/0day-ci/linux/commits/Geliang-Tang/ARM-davinci-fix-a-problematic-usage-of-WARN/20151125-221653
base:   https://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git for-next
config: arm-davinci_all_defconfig (attached as .config)
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=arm 

All error/warnings (new ones prefixed by >>):

   In file included from arch/arm/include/asm/bug.h:62:0,
                    from arch/arm/include/asm/div64.h:63,
                    from include/linux/kernel.h:136,
                    from arch/arm/mach-davinci/board-dm355-evm.c:11:
   arch/arm/mach-davinci/board-dm355-evm.c: In function 'dm355_evm_init':
>> include/asm-generic/bug.h:74:72: error: expected expression before ')' token
    #define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg)
                                                                           ^
   include/asm-generic/bug.h:97:3: note: in expansion of macro '__WARN_printf'
      __WARN_printf(format);     \
      ^
>> arch/arm/mach-davinci/board-dm355-evm.c:387:7: note: in expansion of macro 'WARN'
     if (!WARN(IS_ERR(aemif)), "unable to get AEMIF clock\n"))
          ^
   arch/arm/mach-davinci/board-dm355-evm.c:387:6: warning: value computed is not used [-Wunused-value]
     if (!WARN(IS_ERR(aemif)), "unable to get AEMIF clock\n"))
         ^
>> arch/arm/mach-davinci/board-dm355-evm.c:387:58: error: expected statement before ')' token
     if (!WARN(IS_ERR(aemif)), "unable to get AEMIF clock\n"))
                                                             ^
--
   In file included from arch/arm/include/asm/bug.h:62:0,
                    from arch/arm/include/asm/div64.h:63,
                    from include/linux/kernel.h:136,
                    from arch/arm/mach-davinci/board-dm355-leopard.c:10:
   arch/arm/mach-davinci/board-dm355-leopard.c: In function 'dm355_leopard_init':
>> include/asm-generic/bug.h:74:72: error: expected expression before ')' token
    #define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg)
                                                                           ^
   include/asm-generic/bug.h:97:3: note: in expansion of macro '__WARN_printf'
      __WARN_printf(format);     \
      ^
>> arch/arm/mach-davinci/board-dm355-leopard.c:245:7: note: in expansion of macro 'WARN'
     if (!WARN(IS_ERR(aemif)), "unable to get AEMIF clock\n"))
          ^
   arch/arm/mach-davinci/board-dm355-leopard.c:245:6: warning: value computed is not used [-Wunused-value]
     if (!WARN(IS_ERR(aemif)), "unable to get AEMIF clock\n"))
         ^
>> arch/arm/mach-davinci/board-dm355-leopard.c:245:58: error: expected statement before ')' token
     if (!WARN(IS_ERR(aemif)), "unable to get AEMIF clock\n"))
                                                             ^

vim +387 arch/arm/mach-davinci/board-dm355-evm.c

   381	
   382		gpio_request(1, "dm9000");
   383		gpio_direction_input(1);
   384		dm355evm_dm9000_rsrc[2].start = gpio_to_irq(1);
   385	
   386		aemif = clk_get(&dm355evm_dm9000.dev, "aemif");
 > 387		if (!WARN(IS_ERR(aemif)), "unable to get AEMIF clock\n"))
   388			clk_prepare_enable(aemif);
   389	
   390		platform_add_devices(davinci_evm_devices,

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
-------------- next part --------------
A non-text attachment was scrubbed...
Name: .config.gz
Type: application/octet-stream
Size: 18871 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151126/eeb2e3c4/attachment-0001.obj>

[PATCH v2] ARM: davinci: fix a problematic usage of WARN()

[Arnd Bergmann]

On Thursday 26 November 2015 04:21:09 kbuild test robot wrote:
>    386          aemif = clk_get(&dm355evm_dm9000.dev, "aemif");
>  > 387          if (!WARN(IS_ERR(aemif)), "unable to get AEMIF clock\n"))
>    388                  clk_prepare_enable(aemif);
>    389  
> 

That is an extra ')' after aemif.

	Arnd

[PATCH v3] ARM: davinci: fix a problematic usage of WARN()

[Geliang Tang]

WARN() takes a condition and a format string. The condition was
omitted. So I added it.

Signed-off-by: Geliang Tang <geliangtang@163.com>
---
Changes in v3:
 - fix kbuild test robot error.
Changes in v2:
 - remove __func__ in WARN()
---
 arch/arm/mach-davinci/board-dm355-evm.c     | 4 +---
 arch/arm/mach-davinci/board-dm355-leopard.c | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index c71dd99..1844076 100644
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -384,9 +384,7 @@ static __init void dm355_evm_init(void)
 	dm355evm_dm9000_rsrc[2].start = gpio_to_irq(1);
 
 	aemif = clk_get(&dm355evm_dm9000.dev, "aemif");
-	if (IS_ERR(aemif))
-		WARN("%s: unable to get AEMIF clock\n", __func__);
-	else
+	if (!WARN(IS_ERR(aemif), "unable to get AEMIF clock\n"))
 		clk_prepare_enable(aemif);
 
 	platform_add_devices(davinci_evm_devices,
diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c
index 680a7a2..284ff27 100644
--- a/arch/arm/mach-davinci/board-dm355-leopard.c
+++ b/arch/arm/mach-davinci/board-dm355-leopard.c
@@ -242,9 +242,7 @@ static __init void dm355_leopard_init(void)
 	dm355leopard_dm9000_rsrc[2].start = gpio_to_irq(9);
 
 	aemif = clk_get(&dm355leopard_dm9000.dev, "aemif");
-	if (IS_ERR(aemif))
-		WARN("%s: unable to get AEMIF clock\n", __func__);
-	else
+	if (!WARN(IS_ERR(aemif), "unable to get AEMIF clock\n"))
 		clk_prepare_enable(aemif);
 
 	platform_add_devices(davinci_leopard_devices,
-- 
2.5.0

[PATCH v3] ARM: davinci: fix a problematic usage of WARN()

[Sekhar Nori]

On Thursday 26 November 2015 06:05 AM, Geliang Tang wrote:
> WARN() takes a condition and a format string. The condition was
> omitted. So I added it.
> 
> Signed-off-by: Geliang Tang <geliangtang@163.com>

Applied.

Thanks,
Sekhar