COIL: Update I2C terminology

This CL replaces slave_addr_flags with addr_flags.
For context, "addr_flags" is the name is that is being used in the
caller function. E.g:
http://cs/chromeos_public/src/platform/ec/common/i2c_controller.c?l=137

So, the naming convention is the name as the rest of the functions,
and also conforms with COIL.

BRANCH=None
BUG=b:163885307
TEST=compare_build.sh -b all matches

Signed-off-by: Ricardo Quesada <ricardoq@google.com>
Change-Id: I75efe758daa8f51ae37f6ba2c67c3a7bf8ce3a8e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3436449
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Commit-Queue: Ricardo Quesada <ricardoq@chromium.org>
Tested-by: Ricardo Quesada <ricardoq@chromium.org>
Auto-Submit: Ricardo Quesada <ricardoq@chromium.org>

7 files changed, 26 insertions, 26 deletions

diff --git a/chip/ish/i2c.c b/chip/ish/i2c.c
index eeb4b38d60..11f3e0a0b1 100644
--- a/chip/ish/i2c.c
+++ b/chip/ish/i2c.c
@@ -158,7 +158,7 @@ static void i2c_intr_switch(uint32_t *base, int mode)
 }
 
 static void i2c_init_transaction(struct i2c_context *ctx,
-				 uint16_t slave_addr, uint8_t flags)
+				 uint16_t addr, uint8_t flags)
 {
 	uint32_t con_value;
 	uint32_t *base = ctx->base;
@@ -169,7 +169,7 @@ static void i2c_init_transaction(struct i2c_context *ctx,
 	i2c_intr_switch(base, DISABLE_INT);
 
 	i2c_mmio_write(base, IC_ENABLE, IC_ENABLE_DISABLE);
-	i2c_mmio_write(base, IC_TAR, (slave_addr << IC_TAR_OFFSET) |
+	i2c_mmio_write(base, IC_TAR, (addr << IC_TAR_OFFSET) |
 			TAR_SPECIAL_VAL | IC_10BITADDR_MASTER_VAL);
 
 	/* set Clock SCL Count */
@@ -293,7 +293,7 @@ static void i2c_write_read_commands(uint32_t *base, uint8_t len, int more_data,
 	}
 }
 
-int chip_i2c_xfer(const int port, const uint16_t slave_addr_flags,
+int chip_i2c_xfer(const int port, const uint16_t addr_flags,
 		  const uint8_t *out, int out_size,
 		  uint8_t *in, int in_size, int flags)
 {
@@ -302,7 +302,7 @@ int chip_i2c_xfer(const int port, const uint16_t slave_addr_flags,
 	uint64_t expire_ts;
 	struct i2c_context *ctx;
 	ssize_t curr_index = 0;
-	uint16_t addr = I2C_STRIP_FLAGS(slave_addr_flags);
+	uint16_t addr = I2C_STRIP_FLAGS(addr_flags);
 	int begin_indx;
 	uint8_t repeat_start = 0;
 
@@ -386,7 +386,7 @@ int chip_i2c_xfer(const int port, const uint16_t slave_addr_flags,
 				(begin_indx == 0) && (repeat_start != 0));
 
 
-		/* need timeout in case no ACK from slave */
+		/* need timeout in case no ACK from peripheral */
 		task_wait_event_mask(TASK_EVENT_I2C_IDLE, 2*MSEC);
 
 		if (ctx->interrupts & M_TX_ABRT) {
diff --git a/chip/max32660/i2c_chip.c b/chip/max32660/i2c_chip.c
index f60764662d..c4d8d1eb94 100644
--- a/chip/max32660/i2c_chip.c
+++ b/chip/max32660/i2c_chip.c
@@ -195,7 +195,7 @@ void board_i2c_process(int read, uint8_t addr, int len, char *buffer,
 /**
  * chip_i2c_xfer() - Low Level function for I2C Master Reads and Writes.
  * @port: Port to access
- * @slave_addr:	Slave device address
+ * @addr_flags:	Device address and flags
  * @out: Data to send
  * @out_size: Number of bytes to send
  * @in: Destination buffer for received data
@@ -210,7 +210,7 @@ void board_i2c_process(int read, uint8_t addr, int len, char *buffer,
  *
  * Return EC_SUCCESS, or non-zero if error.
  */
-int chip_i2c_xfer(int port, const uint16_t slave_addr_flags, const uint8_t *out,
+int chip_i2c_xfer(int port, const uint16_t addr_flags, const uint8_t *out,
 		  int out_size, uint8_t *in, int in_size, int flags)
 {
 	int xfer_start;
@@ -221,7 +221,7 @@ int chip_i2c_xfer(int port, const uint16_t slave_addr_flags, const uint8_t *out,
 	xfer_stop = flags & I2C_XFER_STOP;
 
 	if (out_size) {
-		status = i2c_master_write(i2c_bus_ports[port], slave_addr_flags,
+		status = i2c_master_write(i2c_bus_ports[port], addr_flags,
 					  xfer_start, xfer_stop, out, out_size,
 					  1);
 		if (status != EC_SUCCESS) {
@@ -229,7 +229,7 @@ int chip_i2c_xfer(int port, const uint16_t slave_addr_flags, const uint8_t *out,
 		}
 	}
 	if (in_size) {
-		status = i2c_master_read(i2c_bus_ports[port], slave_addr_flags,
+		status = i2c_master_read(i2c_bus_ports[port], addr_flags,
 					 xfer_start, xfer_stop, in, in_size, 0);
 		if (status != EC_SUCCESS) {
 			return status;
diff --git a/chip/mec1322/i2c.c b/chip/mec1322/i2c.c
index f5bb97e95b..c282714265 100644
--- a/chip/mec1322/i2c.c
+++ b/chip/mec1322/i2c.c
@@ -237,7 +237,7 @@ static inline void push_in_buf(uint8_t **in, uint8_t val, int skip)
 }
 
 int chip_i2c_xfer(const int port,
-		  const uint16_t slave_addr_flags,
+		  const uint16_t addr_flags,
 		  const uint8_t *out, int out_size,
 		  uint8_t *in, int in_size, int flags)
 {
@@ -287,7 +287,7 @@ int chip_i2c_xfer(const int port,
 	if (out_size) {
 		if (send_start) {
 			MEC1322_I2C_DATA(controller) =
-				(uint8_t)(I2C_STRIP_FLAGS(slave_addr_flags)
+				(uint8_t)(I2C_STRIP_FLAGS(addr_flags)
 					  << 1);
 
 			/* Clock out the slave address, sending START bit */
@@ -332,7 +332,7 @@ int chip_i2c_xfer(const int port,
 							       CTRL_ENI;
 
 			MEC1322_I2C_DATA(controller) =
-				(uint8_t)(I2C_STRIP_FLAGS(slave_addr_flags)
+				(uint8_t)(I2C_STRIP_FLAGS(addr_flags)
 					  << 1)
 				| 0x01;
 
diff --git a/chip/stm32/i2c-stm32g4.c b/chip/stm32/i2c-stm32g4.c
index eb1c7f1560..fbb13e3453 100644
--- a/chip/stm32/i2c-stm32g4.c
+++ b/chip/stm32/i2c-stm32g4.c
@@ -260,11 +260,11 @@ static int wait_isr(int port, int mask)
  * Exported functions declared in i2c.h
  */
 /* Perform an i2c transaction. */
-int chip_i2c_xfer(const int port, const uint16_t slave_addr_flags,
+int chip_i2c_xfer(const int port, const uint16_t addr_flags,
 		  const uint8_t *out, int out_bytes,
 		  uint8_t *in, int in_bytes, int flags)
 {
-	int addr_8bit = I2C_STRIP_FLAGS(slave_addr_flags) << 1;
+	int addr_8bit = I2C_STRIP_FLAGS(addr_flags) << 1;
 	int rv = EC_SUCCESS;
 	int i;
 	int xfer_start = flags & I2C_XFER_START;
diff --git a/chip/stm32/i2c-stm32l.c b/chip/stm32/i2c-stm32l.c
index 2edcb1c0b6..74ecff192d 100644
--- a/chip/stm32/i2c-stm32l.c
+++ b/chip/stm32/i2c-stm32l.c
@@ -165,11 +165,11 @@ static void i2c_init_port(const struct i2c_port_t *p)
 /* Interface */
 
 int chip_i2c_xfer(const int port,
-		  const uint16_t slave_addr_flags,
+		  const uint16_t addr_flags,
 		  const uint8_t *out, int out_bytes,
 		  uint8_t *in, int in_bytes, int flags)
 {
-	int addr_8bit = I2C_STRIP_FLAGS(slave_addr_flags) << 1;
+	int addr_8bit = I2C_STRIP_FLAGS(addr_flags) << 1;
 	int started = (flags & I2C_XFER_START) ? 0 : 1;
 	int rv = EC_SUCCESS;
 	int i;
diff --git a/chip/stm32/i2c-stm32l4.c b/chip/stm32/i2c-stm32l4.c
index 2afcd1ce9c..f7d311ba87 100644
--- a/chip/stm32/i2c-stm32l4.c
+++ b/chip/stm32/i2c-stm32l4.c
@@ -309,11 +309,11 @@ DECLARE_IRQ(IRQ_SLAVE, i2c_event_interrupt, 2);
 /*****************************************************************************/
 /* Interface */
 
-int chip_i2c_xfer(const int port, const uint16_t slave_addr_flags,
+int chip_i2c_xfer(const int port, const uint16_t addr_flags,
 		  const uint8_t *out, int out_bytes,
 		  uint8_t *in, int in_bytes, int flags)
 {
-	int addr_8bit = I2C_STRIP_FLAGS(slave_addr_flags) << 1;
+	int addr_8bit = I2C_STRIP_FLAGS(addr_flags) << 1;
 	int rv = EC_SUCCESS;
 	int i;
 	int xfer_start = flags & I2C_XFER_START;
diff --git a/chip/stm32/usb_power.c b/chip/stm32/usb_power.c
index 2950423219..3e159d646f 100644
--- a/chip/stm32/usb_power.c
+++ b/chip/stm32/usb_power.c
@@ -406,46 +406,46 @@ int reg_type_mapping(enum usb_power_ina_type ina_type)
 	}
 }
 
-uint16_t ina2xx_readagain(uint8_t port, uint16_t slave_addr_flags)
+uint16_t ina2xx_readagain(uint8_t port, uint16_t addr_flags)
 {
 	int res;
 	uint16_t val;
 
-	res = i2c_xfer(port, slave_addr_flags,
+	res = i2c_xfer(port, addr_flags,
 		       NULL, 0, (uint8_t *)&val, sizeof(uint16_t));
 
 	if (res) {
 		CPRINTS("INA2XX I2C readagain failed p:%d a:%02x",
-			(int)port, (int)I2C_STRIP_FLAGS(slave_addr_flags));
+			(int)port, (int)I2C_STRIP_FLAGS(addr_flags));
 		return 0x0bad;
 	}
 	return (val >> 8) | ((val & 0xff) << 8);
 }
 
 
-uint16_t ina2xx_read(uint8_t port, uint16_t slave_addr_flags,
+uint16_t ina2xx_read(uint8_t port, uint16_t addr_flags,
 		     uint8_t reg)
 {
 	int res;
 	int val;
 
-	res = i2c_read16(port, slave_addr_flags, reg, &val);
+	res = i2c_read16(port, addr_flags, reg, &val);
 	if (res) {
 		CPRINTS("INA2XX I2C read failed p:%d a:%02x, r:%02x",
-			(int)port, (int)I2C_STRIP_FLAGS(slave_addr_flags),
+			(int)port, (int)I2C_STRIP_FLAGS(addr_flags),
 			(int)reg);
 		return 0x0bad;
 	}
 	return (val >> 8) | ((val & 0xff) << 8);
 }
 
-int ina2xx_write(uint8_t port, uint16_t slave_addr_flags,
+int ina2xx_write(uint8_t port, uint16_t addr_flags,
 		 uint8_t reg, uint16_t val)
 {
 	int res;
 	uint16_t be_val = (val >> 8) | ((val & 0xff) << 8);
 
-	res = i2c_write16(port, slave_addr_flags, reg, be_val);
+	res = i2c_write16(port, addr_flags, reg, be_val);
 	if (res)
 		CPRINTS("INA2XX I2C write failed");
 	return res;