]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
mm/cma: use str_plural() in cma_declare_contiguous_multi()
authorThorsten Blum <thorsten.blum@linux.dev>
Mon, 30 Jun 2025 13:23:18 +0000 (15:23 +0200)
committerAndrew Morton <akpm@linux-foundation.org>
Sun, 13 Jul 2025 23:38:23 +0000 (16:38 -0700)
Use the string choice helper function str_plural() to simplify the code
and to fix the following Coccinelle/coccicheck warning reported by
string_choices.cocci:

  opportunity for str_plural(nr)

Link: https://lkml.kernel.org/r/20250630132318.41339-2-thorsten.blum@linux.dev
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Reviewed-by: Dev Jain <dev.jain@arm.com>
Tested-by: Dev Jain <dev.jain@arm.com>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Acked-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/cma.c

index c0b2630a1b81a064ce6a06470eaaca6598a020fd..c40d53298801640df9d02c565eafe0e3cd1feb39 100644 (file)
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -22,6 +22,7 @@
 #include <linux/mm.h>
 #include <linux/sizes.h>
 #include <linux/slab.h>
+#include <linux/string_choices.h>
 #include <linux/log2.h>
 #include <linux/cma.h>
 #include <linux/highmem.h>
@@ -548,8 +549,7 @@ out:
                        (unsigned long)total_size / SZ_1M);
        else
                pr_info("Reserved %lu MiB in %d range%s\n",
-                       (unsigned long)total_size / SZ_1M, nr,
-                       nr > 1 ? "s" : "");
+                       (unsigned long)total_size / SZ_1M, nr, str_plural(nr));
        return ret;
 }