linux-kernel - Re: [PATCH] pnp: isapnp: use str

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAJZ5v0ih9yjN2_jnAGhJWT0QYFJswBPc4-QRu4kjVXoEapGJiA@mail.gmail.com>
Date: Mon, 25 Aug 2025 17:31:35 +0200
From: "Rafael J. Wysocki" <rafael@...nel.org>
To: Xichao Zhao <zhao.xichao@...o.com>
Cc: perex@...ex.cz, rafael@...nel.org, linux-acpi@...r.kernel.org, 
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH] pnp: isapnp: use str_plural() to simplify the code

On Mon, Aug 18, 2025 at 10:25 AM Xichao Zhao <zhao.xichao@...o.com> wrote:
>
> Use the string choice helper function str_plural() to simplify the code.
>
> Signed-off-by: Xichao Zhao <zhao.xichao@...o.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!