Re: [PATCH] iommu/amd: use str_plural() to simplify the code
From: Christophe JAILLET
Date: Mon Aug 18 2025 - 02:55:59 EST
Le 18/08/2025 à 05:53, Xichao Zhao a écrit :
Use the string choice helper function str_plural() to simplify the code.
Signed-off-by: Xichao Zhao <zhao.xichao@xxxxxxxx>
Hi,
---
drivers/iommu/amd/iommu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index eb348c63a8d0..b5c829f89544 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -265,7 +265,7 @@ static inline int get_acpihid_device_id(struct device *dev,
return -EINVAL;
if (fw_bug)
dev_err_once(dev, FW_BUG "No ACPI device matched UID, but %d device%s matched HID.\n",
- hid_count, hid_count > 1 ? "s" : "");
+ hid_count, str_plural(hid_count));
Nitpick: There is a double space after the comma.
if (hid_count > 1)
return -EINVAL;
if (entry)
You should also include <linux/string_choices.h> I think.
CJ