media: saa7134: rename i2c_dbg() to saa7134_i2c_dbg()

Ahead of introducing I2C-adapter-specific printk() helpers, preemptively
avoid a conflict with the upcoming i2c_dbg() and rename the local macro
in the saa7134 driver to saa7134_i2c_dbg().

Suggested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Acked-by: Hans Verkuil <hverkuil+cisco@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/pci/saa7134/saa7134-i2c.c b/drivers/media/pci/saa7134/saa7134-i2c.c
index 04e85765373ecc0f0759eba539c20bcdc9716ca8..1164e91cbb7b7f5250dc02bc086f5cc06ea8f5a5 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134-i2c.c
+++ b/drivers/media/pci/saa7134/saa7134-i2c.c
@@ -28,7 +28,7 @@ static unsigned int i2c_scan;
 module_param(i2c_scan, int, 0444);
 MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time");
 
-#define i2c_dbg(level, fmt, arg...) do { \
+#define saa7134_i2c_dbg(level, fmt, arg...) do { \
        if (i2c_debug == level) \
                printk(KERN_DEBUG pr_fmt("i2c: " fmt), ## arg); \
        } while (0)
@@ -84,20 +84,20 @@ static inline enum i2c_status i2c_get_status(struct saa7134_dev *dev)
        enum i2c_status status;
 
        status = saa_readb(SAA7134_I2C_ATTR_STATUS) & 0x0f;
-       i2c_dbg(2, "i2c stat <= %s\n", str_i2c_status[status]);
+       saa7134_i2c_dbg(2, "i2c stat <= %s\n", str_i2c_status[status]);
        return status;
 }
 
 static inline void i2c_set_status(struct saa7134_dev *dev,
                                  enum i2c_status status)
 {
-       i2c_dbg(2, "i2c stat => %s\n", str_i2c_status[status]);
+       saa7134_i2c_dbg(2, "i2c stat => %s\n", str_i2c_status[status]);
        saa_andorb(SAA7134_I2C_ATTR_STATUS,0x0f,status);
 }
 
 static inline void i2c_set_attr(struct saa7134_dev *dev, enum i2c_attr attr)
 {
-       i2c_dbg(2, "i2c attr => %s\n", str_i2c_attr[attr]);
+       saa7134_i2c_dbg(2, "i2c attr => %s\n", str_i2c_attr[attr]);
        saa_andorb(SAA7134_I2C_ATTR_STATUS,0xc0,attr << 6);
 }
 
@@ -160,7 +160,7 @@ static int i2c_reset(struct saa7134_dev *dev)
        enum i2c_status status;
        int count;
 
-       i2c_dbg(2, "i2c reset\n");
+       saa7134_i2c_dbg(2, "i2c reset\n");
        status = i2c_get_status(dev);
        if (!i2c_is_error(status))
                return true;
@@ -198,7 +198,7 @@ static inline int i2c_send_byte(struct saa7134_dev *dev,
 //     dword |= 0x40 << 16;  /* 400 kHz */
        dword |= 0xf0 << 24;
        saa_writel(SAA7134_I2C_ATTR_STATUS >> 2, dword);
-       i2c_dbg(2, "i2c data => 0x%x\n", data);
+       saa7134_i2c_dbg(2, "i2c data => 0x%x\n", data);
 
        if (!i2c_is_busy_wait(dev))
                return -EIO;
@@ -220,7 +220,7 @@ static inline int i2c_recv_byte(struct saa7134_dev *dev)
        if (i2c_is_error(status))
                return -EIO;
        data = saa_readb(SAA7134_I2C_DATA);
-       i2c_dbg(2, "i2c data <= 0x%x\n", data);
+       saa7134_i2c_dbg(2, "i2c data <= 0x%x\n", data);
        return data;
 }
 
@@ -237,12 +237,12 @@ static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap,
                if (!i2c_reset(dev))
                        return -EIO;
 
-       i2c_dbg(2, "start xfer\n");
-       i2c_dbg(1, "i2c xfer:");
+       saa7134_i2c_dbg(2, "start xfer\n");
+       saa7134_i2c_dbg(1, "i2c xfer:");
        for (i = 0; i < num; i++) {
                if (!(msgs[i].flags & I2C_M_NOSTART) || 0 == i) {
                        /* send address */
-                       i2c_dbg(2, "send address\n");
+                       saa7134_i2c_dbg(2, "send address\n");
                        addr  = msgs[i].addr << 1;
                        if (msgs[i].flags & I2C_M_RD)
                                addr |= 1;
@@ -265,7 +265,7 @@ static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap,
                }
                if (msgs[i].flags & I2C_M_RD) {
                        /* read bytes */
-                       i2c_dbg(2, "read bytes\n");
+                       saa7134_i2c_dbg(2, "read bytes\n");
                        for (byte = 0; byte < msgs[i].len; byte++) {
                                i2c_cont(1, " =");
                                rc = i2c_recv_byte(dev);
@@ -286,7 +286,7 @@ static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap,
                        }
                } else {
                        /* write bytes */
-                       i2c_dbg(2, "write bytes\n");
+                       saa7134_i2c_dbg(2, "write bytes\n");
                        for (byte = 0; byte < msgs[i].len; byte++) {
                                data = msgs[i].buf[byte];
                                i2c_cont(1, " %02x", data);
@@ -296,7 +296,7 @@ static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap,
                        }
                }
        }
-       i2c_dbg(2, "xfer done\n");
+       saa7134_i2c_dbg(2, "xfer done\n");
        i2c_cont(1, " >");
        i2c_set_attr(dev,STOP);
        rc = -EIO;