nvdimm: Use str_plural() to simplify the code

[PATCH] nvdimm: Use str_plural() to simplify the code

Posted by Xichao Zhao 1 month, 1 week ago

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

Signed-off-by: Xichao Zhao <zhao.xichao@vivo.com>
---
 drivers/nvdimm/namespace_devs.c | 2 +-
 drivers/nvdimm/region.c         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c
index 55cfbf1e0a95..507dcae9dac0 100644
--- a/drivers/nvdimm/namespace_devs.c
+++ b/drivers/nvdimm/namespace_devs.c
@@ -1983,7 +1983,7 @@ static struct device **scan_labels(struct nd_region *nd_region)
 	}
 
 	dev_dbg(&nd_region->dev, "discovered %d namespace%s\n", count,
-		count == 1 ? "" : "s");
+		str_plural(count));
 
 	if (count == 0) {
 		struct nd_namespace_pmem *nspm;
diff --git a/drivers/nvdimm/region.c b/drivers/nvdimm/region.c
index 88dc062af5f8..68a26002f8b9 100644
--- a/drivers/nvdimm/region.c
+++ b/drivers/nvdimm/region.c
@@ -70,7 +70,7 @@ static int nd_region_probe(struct device *dev)
 	 * "<async-registered>/<total>" namespace count.
 	 */
 	dev_err(dev, "failed to register %d namespace%s, continuing...\n",
-			err, err == 1 ? "" : "s");
+			err, str_plural(err));
 	return 0;
 }
 
-- 
2.34.1

Re: [PATCH] nvdimm: Use str_plural() to simplify the code

Posted by Dave Jiang 1 month ago


On 8/26/25 7:13 PM, Xichao Zhao wrote:
> Use the string choice helper function str_plural() to simplify the code.
> 
> Signed-off-by: Xichao Zhao <zhao.xichao@vivo.com>

Reviewed-by: Dave Jiang <dave.jiang@intel.com>
> ---
>  drivers/nvdimm/namespace_devs.c | 2 +-
>  drivers/nvdimm/region.c         | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c
> index 55cfbf1e0a95..507dcae9dac0 100644
> --- a/drivers/nvdimm/namespace_devs.c
> +++ b/drivers/nvdimm/namespace_devs.c
> @@ -1983,7 +1983,7 @@ static struct device **scan_labels(struct nd_region *nd_region)
>  	}
>  
>  	dev_dbg(&nd_region->dev, "discovered %d namespace%s\n", count,
> -		count == 1 ? "" : "s");
> +		str_plural(count));
>  
>  	if (count == 0) {
>  		struct nd_namespace_pmem *nspm;
> diff --git a/drivers/nvdimm/region.c b/drivers/nvdimm/region.c
> index 88dc062af5f8..68a26002f8b9 100644
> --- a/drivers/nvdimm/region.c
> +++ b/drivers/nvdimm/region.c
> @@ -70,7 +70,7 @@ static int nd_region_probe(struct device *dev)
>  	 * "<async-registered>/<total>" namespace count.
>  	 */
>  	dev_err(dev, "failed to register %d namespace%s, continuing...\n",
> -			err, err == 1 ? "" : "s");
> +			err, str_plural(err));
>  	return 0;
>  }
>