From: Li Dong <lidong@vivo.com>
Date: Wed, 18 Jun 2025 11:59:54 +0000 (+0800)
Subject: mmc: cb710-mmc: Convert ternary operator to str_plural() helper
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d783ce4fe274709b95f184ff7790041e903abd4a;p=thirdparty%2Fkernel%2Fstable.git

mmc: cb710-mmc: Convert ternary operator to str_plural() helper

Replace direct ternary condition check with existing helper function
str_plural() to improve code readability and maintain consistency.

Signed-off-by: Li Dong <lidong@vivo.com>
Link: https://lore.kernel.org/r/20250618115954.10260-1-lidong@vivo.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---

diff --git a/drivers/mmc/host/cb710-mmc.c b/drivers/mmc/host/cb710-mmc.c
index 8787e7f49e94..448d2f9159ea 100644
--- a/drivers/mmc/host/cb710-mmc.c
+++ b/drivers/mmc/host/cb710-mmc.c
@@ -8,6 +8,7 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
+#include <linux/string_choices.h>
 #include "cb710-mmc.h"
 
 #define CB710_MMC_REQ_TIMEOUT_MS	2000
@@ -215,7 +216,7 @@ static void cb710_mmc_set_transfer_size(struct cb710_slot *slot,
 		((count - 1) << 16)|(blocksize - 1));
 
 	dev_vdbg(cb710_slot_dev(slot), "set up for %zu block%s of %zu bytes\n",
-		count, count == 1 ? "" : "s", blocksize);
+		count, str_plural(count), blocksize);
 }
 
 static void cb710_mmc_fifo_hack(struct cb710_slot *slot)