[folded-merged] mm-cma-fix-the-name-of-cma-areas-fix.patch removed from -mm tree

[folded-merged] mm-cma-fix-the-name-of-cma-areas-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: mm: cma: return cma->name directly in cma_get_name
has been removed from the -mm tree.  Its filename was
     mm-cma-fix-the-name-of-cma-areas-fix.patch

This patch was dropped because it was folded into mm-cma-fix-the-name-of-cma-areas.patch

------------------------------------------------------
From: Nathan Chancellor <natechancellor@gmail.com>
Subject: 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
Link: http://lkml.kernel.org/r/20200623015840.621964-1-natechancellor@gmail.com
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Acked-by: Barry Song <song.bao.hua@hisilicon.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/cma.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/mm/cma.c~mm-cma-fix-the-name-of-cma-areas-fix
+++ a/mm/cma.c
@@ -52,7 +52,7 @@ unsigned long cma_get_size(const struct
 
 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,
_

Patches currently in -mm which might be from natechancellor@gmail.com are

mm-cma-fix-the-name-of-cma-areas.patch