]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
i2c: cp2615: reword according to newest specification
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Wed, 10 Jul 2024 06:41:23 +0000 (08:41 +0200)
committerAndi Shyti <andi.shyti@kernel.org>
Thu, 11 Jul 2024 13:13:30 +0000 (15:13 +0200)
Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2
specifications and replace "master/slave" with more appropriate terms.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Bence Csókás <bence98@sch.bme.hu>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
drivers/i2c/busses/i2c-cp2615.c

index cf3747d870342e3649e290c8f254aa586c36a67a..e7720ea4045eb674616f573a18865af04b14247d 100644 (file)
@@ -60,11 +60,11 @@ enum cp2615_i2c_status {
        CP2615_CFG_LOCKED = -6,
        /* read_len or write_len out of range */
        CP2615_INVALID_PARAM = -4,
-       /* I2C slave did not ACK in time */
+       /* I2C target did not ACK in time */
        CP2615_TIMEOUT,
        /* I2C bus busy */
        CP2615_BUS_BUSY,
-       /* I2C bus error (ie. device NAK'd the request) */
+       /* I2C bus error (ie. target NAK'd the request) */
        CP2615_BUS_ERROR,
        CP2615_SUCCESS
 };
@@ -211,7 +211,7 @@ out:
 }
 
 static int
-cp2615_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
+cp2615_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
 {
        struct usb_interface *usbif = adap->algo_data;
        int i = 0, ret = 0;
@@ -250,8 +250,8 @@ cp2615_i2c_func(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm cp2615_i2c_algo = {
-       .master_xfer    = cp2615_i2c_master_xfer,
-       .functionality  = cp2615_i2c_func,
+       .xfer = cp2615_i2c_xfer,
+       .functionality = cp2615_i2c_func,
 };
 
 /*