Received-SPF: pass (google.com: domain of linux-kernel+bounces-111523-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
To: linux-i2c@vger.kernel.org
Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>,
	Andi Shyti <andi.shyti@kernel.org>,
	linux-renesas-soc@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 45/64] i2c: rcar: reword according to newest specification
Date: Fri, 22 Mar 2024 14:25:38 +0100
Message-ID: <20240322132619.6389-46-wsa+renesas@sang-engineering.com>
In-Reply-To: <20240322132619.6389-1-wsa+renesas@sang-engineering.com>
References: <20240322132619.6389-1-wsa+renesas@sang-engineering.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Match the wording of this driver wrt. the newest I2C v7, SMBus 3.2, I3C
specifications and replace "master/slave" with more appropriate terms.
They are also more specific because we distinguish now between a remote
entity ("client") and a local one ("target").

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 drivers/i2c/busses/i2c-rcar.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
index 828aa2ea0fe4..4be75fdc7187 100644
--- a/drivers/i2c/busses/i2c-rcar.c
+++ b/drivers/i2c/busses/i2c-rcar.c
@@ -883,7 +883,7 @@ static int rcar_i2c_do_reset(struct rcar_i2c_priv *priv)
 					100, false, priv->rstc);
 }
 
-static int rcar_i2c_master_xfer(struct i2c_adapter *adap,
+static int rcar_i2c_xfer(struct i2c_adapter *adap,
 				struct i2c_msg *msgs,
 				int num)
 {
@@ -944,7 +944,7 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap,
 	return ret;
 }
 
-static int rcar_i2c_master_xfer_atomic(struct i2c_adapter *adap,
+static int rcar_i2c_xfer_atomic(struct i2c_adapter *adap,
 				struct i2c_msg *msgs,
 				int num)
 {
@@ -1003,7 +1003,7 @@ static int rcar_i2c_master_xfer_atomic(struct i2c_adapter *adap,
 	return ret;
 }
 
-static int rcar_reg_slave(struct i2c_client *slave)
+static int rcar_reg_target(struct i2c_client *slave)
 {
 	struct rcar_i2c_priv *priv = i2c_get_adapdata(slave->adapter);
 
@@ -1025,7 +1025,7 @@ static int rcar_reg_slave(struct i2c_client *slave)
 	return 0;
 }
 
-static int rcar_unreg_slave(struct i2c_client *slave)
+static int rcar_unreg_target(struct i2c_client *slave)
 {
 	struct rcar_i2c_priv *priv = i2c_get_adapdata(slave->adapter);
 
@@ -1066,11 +1066,11 @@ static u32 rcar_i2c_func(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm rcar_i2c_algo = {
-	.master_xfer	= rcar_i2c_master_xfer,
-	.master_xfer_atomic = rcar_i2c_master_xfer_atomic,
+	.xfer	= rcar_i2c_xfer,
+	.xfer_atomic = rcar_i2c_xfer_atomic,
 	.functionality	= rcar_i2c_func,
-	.reg_slave	= rcar_reg_slave,
-	.unreg_slave	= rcar_unreg_slave,
+	.reg_target	= rcar_reg_target,
+	.unreg_target	= rcar_unreg_target,
 };
 
 static const struct i2c_adapter_quirks rcar_i2c_quirks = {
-- 
2.43.0