]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
i2c: ls2x: reword according to newest specification
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Sat, 6 Jul 2024 11:20:28 +0000 (13:20 +0200)
committerAndi Shyti <andi.shyti@kernel.org>
Thu, 11 Jul 2024 13:14:14 +0000 (15:14 +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>
Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
drivers/i2c/busses/i2c-ls2x.c

index ebae6035701db7e301c92551d68d503ea459f912..8821cac3897b692590b2ec6cc5ba1c370a34ed1d 100644 (file)
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Loongson-2K/Loongson LS7A I2C master mode driver
+ * Loongson-2K/Loongson LS7A I2C controller mode driver
  *
  * Copyright (C) 2013 Loongson Technology Corporation Limited.
  * Copyright (C) 2014-2017 Lemote, Inc.
@@ -51,7 +51,7 @@
 /* Control Register Bit */
 #define LS2X_CTR_EN            BIT(7) /* 0: I2c frequency setting 1: Normal */
 #define LS2X_CTR_IEN           BIT(6) /* Enable i2c interrupt */
-#define LS2X_CTR_MST           BIT(5) /* 0: Slave mode 1: Master mode */
+#define LS2X_CTR_MST           BIT(5) /* 0: Target mode 1: Controller mode */
 #define CTR_FREQ_MASK          GENMASK(7, 6)
 #define CTR_READY_MASK         GENMASK(7, 5)
 
@@ -251,8 +251,7 @@ static int ls2x_i2c_xfer_one(struct ls2x_i2c_priv *priv,
        return ret;
 }
 
-static int ls2x_i2c_master_xfer(struct i2c_adapter *adap,
-                               struct i2c_msg *msgs, int num)
+static int ls2x_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
 {
        int ret;
        struct i2c_msg *msg, *emsg = msgs + num;
@@ -273,8 +272,8 @@ static unsigned int ls2x_i2c_func(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm ls2x_i2c_algo = {
-       .master_xfer    = ls2x_i2c_master_xfer,
-       .functionality  = ls2x_i2c_func,
+       .xfer = ls2x_i2c_xfer,
+       .functionality = ls2x_i2c_func,
 };
 
 static int ls2x_i2c_probe(struct platform_device *pdev)