diff options
| author | Xichao Zhao <zhao.xichao@vivo.com> | 2025-08-27 10:13:25 +0800 |
|---|---|---|
| committer | Ira Weiny <ira.weiny@intel.com> | 2025-09-16 10:57:33 -0500 |
| commit | 11bdf36be82721b8c4eda95a21c78ad856e047f9 (patch) | |
| tree | f2a31beb3b9a4acd89a01dcb94a24fb5840d0696 | |
| parent | Linux 6.17-rc6 (diff) | |
| download | linux-11bdf36be82721b8c4eda95a21c78ad856e047f9.tar.gz linux-11bdf36be82721b8c4eda95a21c78ad856e047f9.zip | |
nvdimm: Use str_plural() to simplify the code
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>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
| -rw-r--r-- | drivers/nvdimm/namespace_devs.c | 2 | ||||
| -rw-r--r-- | 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..53bce1fa376e 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; } |