i2c: brcmstb: 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 a useless comment while here.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>

diff --git a/drivers/i2c/busses/i2c-brcmstb.c b/drivers/i2c/busses/i2c-brcmstb.c
index 38f276c99193b29a7a4a94b126b7acaa8edcdb1d..83b85011e3771b5519860441c14ef7d808179432 100644 (file)
--- a/drivers/i2c/busses/i2c-brcmstb.c
+++ b/drivers/i2c/busses/i2c-brcmstb.c
@@ -67,7 +67,7 @@
 
 /* BSC block register map structure to cache fields to be written */
 struct bsc_regs {
-       u32     chip_address;           /* slave address */
+       u32     chip_address;           /* target address */
        u32     data_in[N_DATA_REGS];   /* tx data buffer*/
        u32     cnt_reg;                /* rx/tx data length */
        u32     ctl_reg;                /* control register */
@@ -320,7 +320,7 @@ cmd_out:
        return rc;
 }
 
-/* Actual data transfer through the BSC master */
+/* Actual data transfer through the BSC controller */
 static int brcmstb_i2c_xfer_bsc_data(struct brcmstb_i2c_dev *dev,
                                     u8 *buf, unsigned int len,
                                     struct i2c_msg *pmsg)
@@ -441,7 +441,6 @@ static int brcmstb_i2c_do_addr(struct brcmstb_i2c_dev *dev,
        return 0;
 }
 
-/* Master transfer function */
 static int brcmstb_i2c_xfer(struct i2c_adapter *adapter,
                            struct i2c_msg msgs[], int num)
 {
@@ -473,7 +472,7 @@ static int brcmstb_i2c_xfer(struct i2c_adapter *adapter,
 
                brcmstb_set_i2c_start_stop(dev, cond);
 
-               /* Send slave address */
+               /* Send target address */
                if (!(pmsg->flags & I2C_M_NOSTART)) {
                        rc = brcmstb_i2c_do_addr(dev, pmsg);
                        if (rc < 0) {
@@ -545,8 +544,8 @@ static u32 brcmstb_i2c_functionality(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm brcmstb_i2c_algo = {
-       .master_xfer = brcmstb_i2c_xfer,
-       .master_xfer_atomic = brcmstb_i2c_xfer_atomic,
+       .xfer = brcmstb_i2c_xfer,
+       .xfer_atomic = brcmstb_i2c_xfer_atomic,
        .functionality = brcmstb_i2c_functionality,
 };