i2c: davinci: reword according to newest specification

Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2
specifications and replace "master/slave" with more appropriate terms.
Remove and reword comments while here.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>

diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
index 7ae611120cfa82eaec8477200dc2bdd6f788d61c..c4fb5e9ab50611b0c6e536786fcd023a0c4743fd 100644 (file)
--- a/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
@@ -263,7 +263,7 @@ static int i2c_davinci_init(struct davinci_i2c_dev *dev)
        /* compute clock dividers */
        i2c_davinci_calc_clk_dividers(dev);
 
-       /* Respond at reserved "SMBus Host" slave address" (and zero);
+       /* Respond at reserved "SMBus Host" target address" (and zero);
         * we seem to have no option to not respond...
         */
        davinci_i2c_write_reg(dev, DAVINCI_I2C_OAR_REG, DAVINCI_I2C_OWN_ADDRESS);
@@ -407,8 +407,8 @@ static int i2c_davinci_wait_bus_not_busy(struct davinci_i2c_dev *dev)
 }
 
 /*
- * Low level master read/write transaction. This function is called
- * from i2c_davinci_xfer.
+ * Low level read/write transaction. This function is called from
+ * i2c_davinci_xfer.
  */
 static int
 i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop)
@@ -428,7 +428,7 @@ i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop)
        if (pdata->bus_delay)
                udelay(pdata->bus_delay);
 
-       /* set the slave address */
+       /* set the target address */
        davinci_i2c_write_reg(dev, DAVINCI_I2C_SAR_REG, msg->addr);
 
        dev->buf = msg->buf;
@@ -440,10 +440,9 @@ i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop)
        reinit_completion(&dev->cmd_complete);
        dev->cmd_err = 0;
 
-       /* Take I2C out of reset and configure it as master */
+       /* Take I2C out of reset and configure it as controller */
        flag = DAVINCI_I2C_MDR_IRS | DAVINCI_I2C_MDR_MST;
 
-       /* if the slave address is ten bit address, enable XA bit */
        if (msg->flags & I2C_M_TEN)
                flag |= DAVINCI_I2C_MDR_XA;
        if (!(msg->flags & I2C_M_RD))
@@ -687,7 +686,7 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id)
                        break;
 
                case DAVINCI_I2C_IVR_AAS:
-                       dev_dbg(dev->dev, "Address as slave interrupt\n");
+                       dev_dbg(dev->dev, "Address as target interrupt\n");
                        break;
 
                default:
@@ -744,8 +743,8 @@ static inline void i2c_davinci_cpufreq_deregister(struct davinci_i2c_dev *dev)
 #endif
 
 static const struct i2c_algorithm i2c_davinci_algo = {
-       .master_xfer    = i2c_davinci_xfer,
-       .functionality  = i2c_davinci_func,
+       .xfer = i2c_davinci_xfer,
+       .functionality = i2c_davinci_func,
 };
 
 static const struct of_device_id davinci_i2c_of_match[] = {