mm: cma: Return cma->name directly in cma_get_name
diff mbox series

Message ID 20200623015840.621964-1-natechancellor@gmail.com
State New
Headers show
Series
  • mm: cma: Return cma->name directly in cma_get_name
Related show

Commit Message

Nathan Chancellor June 23, 2020, 1:58 a.m. UTC
clang warns:

mm/cma.c:55:14: warning: address of array 'cma->name' will always
evaluate to 'true' [-Wpointer-bool-conversion]
        return cma->name ? cma->name : "(undefined)";
               ~~~~~^~~~ ~
1 warning generated.

After commit e7f0557d7de9 ("mm: cma: fix the name of CMA areas"),
cma->name will be an array with some value worth printing so we do not
need to check for NULL.

Link: https://github.com/ClangBuiltLinux/linux/issues/1063
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
---
 mm/cma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


base-commit: 27f11fea33608cbd321a97cbecfa2ef97dcc1821

Comments

Song Bao Hua (Barry Song) June 23, 2020, 2:07 a.m. UTC | #1
> -----Original Message-----
> From: Nathan Chancellor [mailto:natechancellor@gmail.com]
> Sent: Tuesday, June 23, 2020 1:59 PM
> To: Andrew Morton <akpm@linux-foundation.org>
> Cc: linux-mm@kvack.org; linux-kernel@vger.kernel.org;
> clang-built-linux@googlegroups.com; Song Bao Hua (Barry Song)
> <song.bao.hua@hisilicon.com>; Nathan Chancellor
> <natechancellor@gmail.com>
> Subject: [PATCH] mm: cma: Return cma->name directly in cma_get_name
> 
> clang warns:
> 
> mm/cma.c:55:14: warning: address of array 'cma->name' will always
> evaluate to 'true' [-Wpointer-bool-conversion]
>         return cma->name ? cma->name : "(undefined)";
>                ~~~~~^~~~ ~
> 1 warning generated.
> 
> After commit e7f0557d7de9 ("mm: cma: fix the name of CMA areas"),
> cma->name will be an array with some value worth printing so we do not
> need to check for NULL.
> 
> Link: https://github.com/ClangBuiltLinux/linux/issues/1063
> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>

Thanks!

Acked-by: Barry Song <song.bao.hua@hisilicon.com>

> ---
>  mm/cma.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/mm/cma.c b/mm/cma.c
> index 31a61d410c59..6cf08817bac6 100644
> --- a/mm/cma.c
> +++ b/mm/cma.c
> @@ -52,7 +52,7 @@ unsigned long cma_get_size(const struct cma *cma)
> 
>  const char *cma_get_name(const struct cma *cma)
>  {
> -	return cma->name ? cma->name : "(undefined)";
> +	return cma->name;
>  }
> 
>  static unsigned long cma_bitmap_aligned_mask(const struct cma *cma,
> 
> base-commit: 27f11fea33608cbd321a97cbecfa2ef97dcc1821
> --
> 2.27.0

Patch
diff mbox series

diff --git a/mm/cma.c b/mm/cma.c
index 31a61d410c59..6cf08817bac6 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -52,7 +52,7 @@  unsigned long cma_get_size(const struct cma *cma)
 
 const char *cma_get_name(const struct cma *cma)
 {
-	return cma->name ? cma->name : "(undefined)";
+	return cma->name;
 }
 
 static unsigned long cma_bitmap_aligned_mask(const struct cma *cma,