soundwire: Use str_enable_disable-like helpers

Replace ternary (condition ? "enable" : "disable") syntax with helpers
from string_choices.h because:
1. Simple function call with one argument is easier to read.  Ternary
   operator has three arguments and with wrapping might lead to quite
   long code.
2. Is slightly shorter thus also easier to read.
3. It brings uniformity in the text - same string.
4. Allows deduping by the linker, which results in a smaller binary
   file.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20250114200726.969501-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c
index 9b295fc9acd53460af56219ad02712bef3be31e4..25120aa3bd67aaa7f698124dc7fd3c4304a3c2f7 100644 (file)
--- a/drivers/soundwire/bus.c
+++ b/drivers/soundwire/bus.c
@@ -8,6 +8,7 @@
 #include <linux/soundwire/sdw_registers.h>
 #include <linux/soundwire/sdw.h>
 #include <linux/soundwire/sdw_type.h>
+#include <linux/string_choices.h>
 #include "bus.h"
 #include "irq.h"
 #include "sysfs_local.h"
@@ -277,7 +278,7 @@ static int sdw_transfer_unlocked(struct sdw_bus *bus, struct sdw_msg *msg)
        if (ret != 0 && ret != -ENODATA)
                dev_err(bus->dev, "trf on Slave %d failed:%d %s addr %x count %d\n",
                        msg->dev_num, ret,
-                       (msg->flags & SDW_MSG_FLAG_WRITE) ? "write" : "read",
+                       str_write_read(msg->flags & SDW_MSG_FLAG_WRITE),
                        msg->addr, msg->len);
 
        return ret;
@@ -1263,7 +1264,7 @@ int sdw_configure_dpn_intr(struct sdw_slave *slave,
 
        if (slave->bus->params.s_data_mode != SDW_PORT_DATA_MODE_NORMAL) {
                dev_dbg(&slave->dev, "TEST FAIL interrupt %s\n",
-                       enable ? "on" : "off");
+                       str_on_off(enable));
                mask |= SDW_DPN_INT_TEST_FAIL;
        }
 

diff --git a/drivers/soundwire/debugfs.c b/drivers/soundwire/debugfs.c
index c30f571934ee2e84ff4387833c60dc7b42a2b843..5bf0d9552433f738515be9c9f8be4a48c9a25ff0 100644 (file)
--- a/drivers/soundwire/debugfs.c
+++ b/drivers/soundwire/debugfs.c
@@ -10,6 +10,7 @@
 #include <linux/slab.h>
 #include <linux/soundwire/sdw.h>
 #include <linux/soundwire/sdw_registers.h>
+#include <linux/string_choices.h>
 #include "bus.h"
 
 static struct dentry *sdw_debugfs_root;
@@ -153,7 +154,7 @@ static int set_command(void *data, u64 value)
        /* Userspace changed the hardware state behind the kernel's back */
        add_taint(TAINT_USER, LOCKDEP_STILL_OK);
 
-       dev_dbg(&slave->dev, "command: %s\n", value ? "read" : "write");
+       dev_dbg(&slave->dev, "command: %s\n", str_read_write(value));
        cmd = value;
 
        return 0;

diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c
index e9df503332bbdd84c5c1daef6d65099166a37b0b..dd8de88d8b462bbdc6a13d1aebe3d39809cf50d0 100644 (file)
--- a/drivers/soundwire/stream.c
+++ b/drivers/soundwire/stream.c
@@ -14,6 +14,7 @@
 #include <linux/soundwire/sdw_registers.h>
 #include <linux/soundwire/sdw.h>
 #include <linux/soundwire/sdw_type.h>
+#include <linux/string_choices.h>
 #include <sound/soc.h>
 #include "bus.h"
 
@@ -358,7 +359,7 @@ static int sdw_enable_disable_master_ports(struct sdw_master_runtime *m_rt,
        } else {
                dev_err(bus->dev,
                        "dpn_port_enable_ch not supported, %s failed\n",
-                       en ? "enable" : "disable");
+                       str_enable_disable(en));
                return -EINVAL;
        }