pnp: isapnp: use str_plural() to simplify the code

[PATCH] pnp: isapnp: use str_plural() to simplify the code

Posted by Xichao Zhao 1 month, 2 weeks ago

Use the string choice helper function str_plural() to simplify the code.

Signed-off-by: Xichao Zhao <zhao.xichao@vivo.com>
---
 drivers/pnp/isapnp/core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index d2ff76e74a05..219f96f2aaaf 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -27,6 +27,7 @@
 #include <linux/init.h>
 #include <linux/isapnp.h>
 #include <linux/mutex.h>
+#include <linux/string_choices.h>
 #include <asm/io.h>
 
 #include "../base.h"
@@ -1037,7 +1038,7 @@ static int __init isapnp_init(void)
 	if (cards)
 		printk(KERN_INFO
 		       "isapnp: %i Plug & Play card%s detected total\n", cards,
-		       cards > 1 ? "s" : "");
+		       str_plural(cards));
 	else
 		printk(KERN_INFO "isapnp: No Plug & Play card found\n");
 
-- 
2.34.1

Re: [PATCH] pnp: isapnp: use str_plural() to simplify the code

Posted by Rafael J. Wysocki 1 month, 1 week ago

On Mon, Aug 18, 2025 at 10:25 AM Xichao Zhao <zhao.xichao@vivo.com> wrote:
>
> Use the string choice helper function str_plural() to simplify the code.
>
> Signed-off-by: Xichao Zhao <zhao.xichao@vivo.com>
> ---
>  drivers/pnp/isapnp/core.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
> index d2ff76e74a05..219f96f2aaaf 100644
> --- a/drivers/pnp/isapnp/core.c
> +++ b/drivers/pnp/isapnp/core.c
> @@ -27,6 +27,7 @@
>  #include <linux/init.h>
>  #include <linux/isapnp.h>
>  #include <linux/mutex.h>
> +#include <linux/string_choices.h>
>  #include <asm/io.h>
>
>  #include "../base.h"
> @@ -1037,7 +1038,7 @@ static int __init isapnp_init(void)
>         if (cards)
>                 printk(KERN_INFO
>                        "isapnp: %i Plug & Play card%s detected total\n", cards,
> -                      cards > 1 ? "s" : "");
> +                      str_plural(cards));
>         else
>                 printk(KERN_INFO "isapnp: No Plug & Play card found\n");
>
> --

Applied as 6.18 material, thanks!