2024-03-30 17:58:53

by Thorsten Blum

[permalink] [raw]
Subject: [PATCH] m68k: amiga: Use str_plural() to fix Coccinelle warning

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

opportunity for str_plural(zorro_num_autocon)

Signed-off-by: Thorsten Blum <[email protected]>
---
arch/m68k/amiga/config.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c
index 99718f3dc686..d4b170c861bf 100644
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
@@ -836,7 +836,7 @@ static void amiga_get_hardware_list(struct seq_file *m)
seq_printf(m, "\tZorro II%s AutoConfig: %d Expansion "
"Device%s\n",
AMIGAHW_PRESENT(ZORRO3) ? "I" : "",
- zorro_num_autocon, zorro_num_autocon == 1 ? "" : "s");
+ zorro_num_autocon, str_plural(zorro_num_autocon));
#endif /* CONFIG_ZORRO */

#undef AMIGAHW_ANNOUNCE
--
2.44.0



2024-04-12 21:58:48

by Thorsten Blum

[permalink] [raw]
Subject: [RESEND PATCH] m68k: amiga: Use str_plural() to fix Coccinelle warning

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

opportunity for str_plural(zorro_num_autocon)

Signed-off-by: Thorsten Blum <[email protected]>
---
arch/m68k/amiga/config.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c
index 99718f3dc686..d4b170c861bf 100644
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
@@ -836,7 +836,7 @@ static void amiga_get_hardware_list(struct seq_file *m)
seq_printf(m, "\tZorro II%s AutoConfig: %d Expansion "
"Device%s\n",
AMIGAHW_PRESENT(ZORRO3) ? "I" : "",
- zorro_num_autocon, zorro_num_autocon == 1 ? "" : "s");
+ zorro_num_autocon, str_plural(zorro_num_autocon));
#endif /* CONFIG_ZORRO */

#undef AMIGAHW_ANNOUNCE
--
2.44.0


2024-04-29 14:44:04

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: [PATCH] m68k: amiga: Use str_plural() to fix Coccinelle warning

On Sat, Mar 30, 2024 at 6:58 PM Thorsten Blum <thorsten.blum@tobluxcom> wrote:
> Fixes the following Coccinelle/coccicheck warning reported by
> string_choices.cocci:
>
> opportunity for str_plural(zorro_num_autocon)
>
> Signed-off-by: Thorsten Blum <[email protected]>

Reviewed-by: Geert Uytterhoeven <[email protected]>
i.e. will queue in the m68k tree for v6.10.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68korg

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds