i2c: Use str_read_write() helper

Remove hard-coded strings by using the str_read_write() helper.

Signed-off-by: Yumeng Fang <fang.yumeng@zte.com.cn>
Signed-off-by: Yunjian Long <long.yunjian@zte.com.cn>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c
index 7a01f26..740066c 100644 (file)
--- a/drivers/i2c/algos/i2c-algo-pcf.c
+++ b/drivers/i2c/algos/i2c-algo-pcf.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-pcf.h>
+#include <linux/string_choices.h>
 #include "i2c-algo-pcf.h"
 
 
@@ -316,7 +317,7 @@ static int pcf_xfer(struct i2c_adapter *i2c_adap,
                pmsg = &msgs[i];
 
                DEB2(printk(KERN_DEBUG "i2c-algo-pcf.o: Doing %s %d bytes to 0x%02x - %d of %d messages\n",
-                    pmsg->flags & I2C_M_RD ? "read" : "write",
+                    str_read_write(pmsg->flags & I2C_M_RD),
                     pmsg->len, pmsg->addr, i + 1, num);)
 
                ret = pcf_doAddress(adap, pmsg);

diff --git a/drivers/i2c/busses/i2c-at91-master.c b/drivers/i2c/busses/i2c-at91-master.c
index ee3b469..374fc50 100644 (file)
--- a/drivers/i2c/busses/i2c-at91-master.c
+++ b/drivers/i2c/busses/i2c-at91-master.c
@@ -26,6 +26,7 @@
 #include <linux/pinctrl/consumer.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/string_choices.h>
 
 #include "i2c-at91.h"
 
@@ -523,7 +524,7 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev)
         */
 
        dev_dbg(dev->dev, "transfer: %s %zu bytes.\n",
-               (dev->msg->flags & I2C_M_RD) ? "read" : "write", dev->buf_len);
+               str_read_write(dev->msg->flags & I2C_M_RD), dev->buf_len);
 
        reinit_completion(&dev->cmd_complete);
        dev->transfer_status = 0;

diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c
index efe2962..adfcee6 100644 (file)
--- a/drivers/i2c/busses/i2c-sh_mobile.c
+++ b/drivers/i2c/busses/i2c-sh_mobile.c
@@ -24,6 +24,7 @@
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
+#include <linux/string_choices.h>
 
 /* Transmit operation:                                                      */
 /*                                                                          */
@@ -409,7 +410,7 @@ static irqreturn_t sh_mobile_i2c_isr(int irq, void *dev_id)
        pd->sr |= sr; /* remember state */
 
        dev_dbg(pd->dev, "i2c_isr 0x%02x 0x%02x %s %d %d!\n", sr, pd->sr,
-              (pd->msg->flags & I2C_M_RD) ? "read" : "write",
+              str_read_write(pd->msg->flags & I2C_M_RD),
               pd->pos, pd->msg->len);
 
        /* Kick off TxDMA after preface was done */

diff --git a/drivers/i2c/busses/i2c-tiny-usb.c b/drivers/i2c/busses/i2c-tiny-usb.c
index 0f2ed18..a18eab0 100644 (file)
--- a/drivers/i2c/busses/i2c-tiny-usb.c
+++ b/drivers/i2c/busses/i2c-tiny-usb.c
@@ -10,6 +10,7 @@
 #include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/string_choices.h>
 #include <linux/types.h>
 
 /* include interfaces to usb layer */
@@ -71,7 +72,7 @@ static int usb_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num)
 
                dev_dbg(&adapter->dev,
                        "  %d: %s (flags %d) %d bytes to 0x%02x\n",
-                       i, pmsg->flags & I2C_M_RD ? "read" : "write",
+                       i, str_read_write(pmsg->flags & I2C_M_RD),
                        pmsg->flags, pmsg->len, pmsg->addr);
 
                /* and directly send the message */

diff --git a/drivers/i2c/busses/i2c-viperboard.c b/drivers/i2c/busses/i2c-viperboard.c
index 7523e7c..1bd6028 100644 (file)
--- a/drivers/i2c/busses/i2c-viperboard.c
+++ b/drivers/i2c/busses/i2c-viperboard.c
@@ -11,6 +11,7 @@
 #include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/string_choices.h>
 #include <linux/types.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
@@ -278,7 +279,7 @@ static int vprbrd_i2c_xfer(struct i2c_adapter *i2c, struct i2c_msg *msgs,
 
                dev_dbg(&i2c->dev,
                        "  %d: %s (flags %d) %d bytes to 0x%02x\n",
-                       i, pmsg->flags & I2C_M_RD ? "read" : "write",
+                       i, str_read_write(pmsg->flags & I2C_M_RD),
                        pmsg->flags, pmsg->len, pmsg->addr);
 
                mutex_lock(&vb->lock);

diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 5f6ff35..2ad2b18 100644 (file)
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -41,6 +41,7 @@
 #include <linux/property.h>
 #include <linux/rwsem.h>
 #include <linux/slab.h>
+#include <linux/string_choices.h>
 
 #include "i2c-core.h"
 
@@ -2144,7 +2145,7 @@ static int i2c_quirk_error(struct i2c_adapter *adap, struct i2c_msg *msg, char *
 {
        dev_err_ratelimited(&adap->dev, "adapter quirk: %s (addr 0x%04x, size %u, %s)\n",
                            err_msg, msg->addr, msg->len,
-                           msg->flags & I2C_M_RD ? "read" : "write");
+                           str_read_write(msg->flags & I2C_M_RD));
        return -EOPNOTSUPP;
 }
 

diff --git a/drivers/i2c/i2c-core-smbus.c b/drivers/i2c/i2c-core-smbus.c
index e73afbe..71eb1ef 100644 (file)
--- a/drivers/i2c/i2c-core-smbus.c
+++ b/drivers/i2c/i2c-core-smbus.c
@@ -16,6 +16,7 @@
 #include <linux/i2c-smbus.h>
 #include <linux/property.h>
 #include <linux/slab.h>
+#include <linux/string_choices.h>
 
 #include "i2c-core.h"
 
@@ -433,7 +434,7 @@ static s32 i2c_smbus_xfer_emulated(struct i2c_adapter *adapter, u16 addr,
        case I2C_SMBUS_I2C_BLOCK_DATA:
                if (data->block[0] > I2C_SMBUS_BLOCK_MAX) {
                        dev_err(&adapter->dev, "Invalid block %s size %d\n",
-                               read_write == I2C_SMBUS_READ ? "read" : "write",
+                               str_read_write(read_write == I2C_SMBUS_READ),
                                data->block[0]);
                        return -EINVAL;
                }