From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 677DEC8302D for ; Mon, 30 Jun 2025 13:24:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D87F26B00DF; Mon, 30 Jun 2025 09:24:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D38466B00E0; Mon, 30 Jun 2025 09:24:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C4EAB6B00E1; Mon, 30 Jun 2025 09:24:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id B13B16B00DF for ; Mon, 30 Jun 2025 09:24:11 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 589AA1D7475 for ; Mon, 30 Jun 2025 13:24:11 +0000 (UTC) X-FDA: 83612135502.19.1FBAEAF Received: from out-173.mta1.migadu.com (out-173.mta1.migadu.com [95.215.58.173]) by imf28.hostedemail.com (Postfix) with ESMTP id 89B9FC0009 for ; Mon, 30 Jun 2025 13:24:09 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=AcTKM6Bu; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf28.hostedemail.com: domain of thorsten.blum@linux.dev designates 95.215.58.173 as permitted sender) smtp.mailfrom=thorsten.blum@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751289849; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=qAGlzeWXRlMA2Zij8Qp03D2CGSSdLuFgwBSG6gDWPG8=; b=M1m/2SsNSYUCepx9z0SExp8tPwsXMR5Jd1MrGKkDY8+NTe9LuWGiKOHsHiSDIEp3I0Qvg4 LVkT+JSTp20CvTm+GbXPblB0k0/F6b2WlUpNLk3LYx2pxLYjsUeRMEbNffomkO9rv/gIdi 1dhYHWuJLRK8F8Iiyozj0rGOuryJWwU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751289849; a=rsa-sha256; cv=none; b=eG1K6KqtrmUZGi03A6pFr8Plk/WYYRpMSSF60qG+j2ckHPxGRuMpmvRQ3WSSr/+H/qegLG QtdLOtN67ZWn0c7qWtx0jvXVcouMyj1O6jRmKHVjJ4d4FQx4tnfhhneXDgG2zyhP3JeC6r lzcYf2G/XX1BiAeHeK7eipId64L3s5w= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=AcTKM6Bu; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf28.hostedemail.com: domain of thorsten.blum@linux.dev designates 95.215.58.173 as permitted sender) smtp.mailfrom=thorsten.blum@linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1751289847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=qAGlzeWXRlMA2Zij8Qp03D2CGSSdLuFgwBSG6gDWPG8=; b=AcTKM6BuqAY3kgrIzG/gg9kzJvLwnPRd8XO/VZDatCB/hIsFPIkSKia5dvTuIBHA+CKCfe lnohH5xqW8rcVJKUI9VwpHIwLq7frob2pgU8+80Bua68KHsDZH5osZcew0iOJlKvHX8E1G LyWbh89spp1PFk+JbgoN6Qd5uTp82pg= From: Thorsten Blum To: Andrew Morton Cc: Thorsten Blum , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm/cma: Use str_plural() in cma_declare_contiguous_multi() Date: Mon, 30 Jun 2025 15:23:18 +0200 Message-ID: <20250630132318.41339-2-thorsten.blum@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Stat-Signature: 54kjq53sc1nu5aw8xiwmpdq5dcnks7kg X-Rspamd-Queue-Id: 89B9FC0009 X-Rspam-User: X-Rspamd-Server: rspam07 X-HE-Tag: 1751289849-82730 X-HE-Meta: U2FsdGVkX1/5vcCKypZVvXU4G5yg076k9kDdne4/0mJCdqRUjv67ibuoRRqw1NY/puZbD4rBfShkMNQ3bPo4b4KNGPblvyYetX5rp/VXQN9re5jh8wrLFvKhSkdEWE6NVNTh5vu6Bvhbbp1vAKZDJemVSTUSyYhAUUM0uWAwXEhWekJ6DxcJj9Gwocqj3Re5oUg0ps/1K8K78O83S33Wgfu1HANM+ybO5PrIJwBfTK90jW99u86LjiOFcA1r/h6WmIqVAEqn0Gm9mv/oA3yCHgYm5H1IXcS8uWwMdVD801i12W6wqUg/zgBnmhrRFRzz2lsSM3MvS3XsqH3qsWvvGeLWzsLG21E2ayV64edr5yBRiSGkQD/55gRWmuywtSmadgO+yXBVcdy9E551zepyCNv3smPee5iwmueqG5WIj+L7flIbe2wPfJCI5Hmq0Z+gRs1UVlkP7xVxF47PGJJ5OpbA4ln/JN2LpsFDFcw+qUuYT7svKW6DgiYNLtaHiY+FqCufm3bZaVqSJyiUqL4MsjHk3m8i9Cx9d+0mCvYIdEhge/DlzP6vuiX4qI66GOT3Sq6s4aJudzrKkfz2a/jtSI9ELqWVoy/yGLKt6ZfsSVq8TqntffpUSA0VSvohQIeciA8b7ycZH8nRFjMdfHMHEj5ACBJrK5w/JFgE8bkAabLupdDc9QJPMhbI0/NUSJP+kSvi5wCeMbto++G/hJkTkKEZu83miOGMyHTrAYwTj+LZhXTIdxvUyWQpOPiUhsfwcHlia6PTeQ1WJGU9q8hoFrSTQDdWoV31elAIo2MeiHg8SxKQ1XxWU+eK4kcHZ1kbxyVOXksJ2DTFdICd9lb0sctK0Uwa5butao38gUMS+Ag6kxsa6/ZBYVs61pGEM87NJWRkAng0TEgyyPem/pE/Qoypg/FbkBzCpTXyPwWuDajYMvjhUPveKrKsAVLwhci7qn5U3a0ByYcJ2LvkKV5 +3TONe+5 c3AmAOVBrsTgcXP3oUq5Jy4+E25kHMEoLDce2MSjyyurdsSXxc7aJQ5IzptLB9U0lq/XGBYag85sP3mwNo1J60jJKcK5hYRqbfUk7IRPxzQ+1/GxthCVMoEHCkqawyNZiBxgHCMwDi2Fjkybodfe4wPTiGYUXuqZALQNnQy/r669R8hQJyqU1vk8ljGEzkQwnYlV6uPqTVyWYXc7j58RBz3qC7S5NQ6MmOIFrCOTxxJPlXu6T3waoyLKGEaoDjBlQ7n7hS5+Ecjy4kIZWXr7pLjywOkLY/kBRzkOE X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 --- 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 #include #include +#include #include #include #include @@ -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; } -- 2.50.0