Received-SPF: pass (google.com: domain of linux-kernel+bounces-173500-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Thorsten Blum <thorsten.blum@toblux.com>
To: paulmck@kernel.org
Cc: imran.f.khan@oracle.com,
	leobras@redhat.com,
	linux-kernel@vger.kernel.org,
	peterz@infradead.org,
	riel@surriel.com,
	tglx@linutronix.de,
	thorsten.blum@toblux.com
Subject: [RESEND PATCH v2] smp: Use str_plural() to fix Coccinelle warnings
Date: Wed,  8 May 2024 17:42:26 +0200
Message-ID: <20240508154225.309703-2-thorsten.blum@toblux.com>
In-Reply-To: <4382b62a-7625-438e-8eaf-137bd88a499b@paulmck-laptop>
References: <4382b62a-7625-438e-8eaf-137bd88a499b@paulmck-laptop>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Fixes the following two Coccinelle/coccicheck warnings reported by
string_choices.cocci:

	opportunity for str_plural(num_cpus)
	opportunity for str_plural(num_nodes)

Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
Acked-by: Paul E. McKenney <paulmck@kernel.org>
---
Changes in v2:
- Include missing header file
---
 kernel/smp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kernel/smp.c b/kernel/smp.c
index f085ebcdf9e7..28fee28174e0 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -25,6 +25,7 @@
 #include <linux/nmi.h>
 #include <linux/sched/debug.h>
 #include <linux/jump_label.h>
+#include <linux/string_choices.h>
 
 #include <trace/events/ipi.h>
 #define CREATE_TRACE_POINTS
@@ -982,8 +983,8 @@ void __init smp_init(void)
 	num_nodes = num_online_nodes();
 	num_cpus  = num_online_cpus();
 	pr_info("Brought up %d node%s, %d CPU%s\n",
-		num_nodes, (num_nodes > 1 ? "s" : ""),
-		num_cpus,  (num_cpus  > 1 ? "s" : ""));
+		num_nodes, str_plural(num_nodes),
+		num_cpus,  str_plural(num_cpus));
 
 	/* Any cleanup work */
 	smp_cpus_done(setup_max_cpus);
-- 
2.45.0