]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
i2c: algo: bit: use str_plural helper in bit_xfer
authorThorsten Blum <thorsten.blum@linux.dev>
Mon, 11 May 2026 10:49:13 +0000 (12:49 +0200)
committerAndi Shyti <andi.shyti@kernel.org>
Tue, 16 Jun 2026 21:58:35 +0000 (23:58 +0200)
Replace the manual ternary "s" pluralizations with str_plural() to
simplify the code.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/20260511104911.183606-3-thorsten.blum@linux.dev
drivers/i2c/algos/i2c-algo-bit.c

index 6544d27e44190a5772caf2d32a1b9f792bdfb5bc..d1d9a6c1a1e2ce2ccfbc4f30aece6ab53e8c19f2 100644 (file)
@@ -13,6 +13,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
+#include <linux/string_choices.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 
@@ -562,7 +563,7 @@ static int bit_xfer(struct i2c_adapter *i2c_adap,
                        ret = readbytes(i2c_adap, pmsg);
                        if (ret >= 1)
                                bit_dbg(2, &i2c_adap->dev, "read %d byte%s\n",
-                                       ret, ret == 1 ? "" : "s");
+                                       ret, str_plural(ret));
                        if (ret < pmsg->len) {
                                if (ret >= 0)
                                        ret = -EIO;
@@ -573,7 +574,7 @@ static int bit_xfer(struct i2c_adapter *i2c_adap,
                        ret = sendbytes(i2c_adap, pmsg);
                        if (ret >= 1)
                                bit_dbg(2, &i2c_adap->dev, "wrote %d byte%s\n",
-                                       ret, ret == 1 ? "" : "s");
+                                       ret, str_plural(ret));
                        if (ret < pmsg->len) {
                                if (ret >= 0)
                                        ret = -EIO;