Re: [PATCH] mm/cma: Use str_plural() in cma_declare_contiguous_multi()

[Anshuman Khandual <anshuman.khandual@arm.com>]

On 30/06/25 6:53 PM, Thorsten Blum wrote:
> 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)
> 
> Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
> ---
>  mm/cma.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/mm/cma.c b/mm/cma.c
> index c0b2630a1b81..c40d53298801 100644
> --- 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 @@ int __init cma_declare_contiguous_multi(phys_addr_t total_size,
>  			(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;
>  }
>


Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>