[v2] smp: Use str_plural() to fix Coccinelle warnings

[PATCH v2] smp: Use str_plural() to fix Coccinelle warnings

Posted by Thorsten Blum 1 year, 10 months ago

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>
---
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.44.0

Re: [PATCH v2] smp: Use str_plural() to fix Coccinelle warnings

Posted by Paul E. McKenney 1 year, 10 months ago

On Mon, Apr 01, 2024 at 04:31:18PM +0200, Thorsten Blum wrote:
> 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.44.0
>

[RESEND PATCH v2] smp: Use str_plural() to fix Coccinelle warnings

Posted by Thorsten Blum 1 year, 9 months ago

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

[tip: smp/core] smp: Use str_plural() to fix Coccinelle warnings

Posted by tip-bot2 for Thorsten Blum 1 year, 7 months ago

The following commit has been merged into the smp/core branch of tip:

Commit-ID:     c4df15931cb72556fea93bd763ada88e56cbd8e5
Gitweb:        https://git.kernel.org/tip/c4df15931cb72556fea93bd763ada88e56cbd8e5
Author:        Thorsten Blum <thorsten.blum@toblux.com>
AuthorDate:    Wed, 08 May 2024 17:42:26 +02:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Mon, 17 Jun 2024 15:17:44 +02:00

smp: Use str_plural() to fix Coccinelle warnings

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>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Paul E. McKenney <paulmck@kernel.org>
Link: https://lore.kernel.org/r/20240508154225.309703-2-thorsten.blum@toblux.com

---
 kernel/smp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/smp.c b/kernel/smp.c
index f085ebc..1848357 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,7 @@ 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);