[PATCH] mm: cma: Return cma->name directly in cma_get_name

From: Nathan Chancellor
Date: Mon Jun 22 2020 - 22:00:07 EST


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@xxxxxxxxx>
---
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