Remove __7b, __8b and __7bf

The extentions were added to make the compiler perform most
of the verification that the conversion was being done correctly
to remove 8bit addressing as the standard I2C/SPI address type.

Now that the compiler has verified the code, the extra
extentions are being removed

BUG=chromium:971296
BRANCH=none
TEST=make buildall -j
TEST=verify sensor functionality on arcada_ish

Change-Id: I36894f8bb9daefb5b31b5e91577708f6f9af2a4f
Signed-off-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1704792
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>

1 files changed, 9 insertions, 9 deletions

diff --git a/driver/baro_bmp280.c b/driver/baro_bmp280.c
index 10d1c4b91a..56376c8aa1 100644
--- a/driver/baro_bmp280.c
+++ b/driver/baro_bmp280.c
@@ -98,7 +98,7 @@ static int bmp280_get_calib_param(const struct motion_sensor_t *s)
 	uint8_t a_data_u8[BMP280_CALIB_DATA_SIZE] = {0};
 	struct bmp280_drv_data_t *data = BMP280_GET_DATA(s);
 
-	ret = i2c_read_block__7bf(s->port, s->i2c_spi_addr__7bf,
+	ret = i2c_read_block(s->port, s->i2c_spi_addr_flags,
 			BMP280_TEMPERATURE_CALIB_DIG_T1_LSB_REG,
 			a_data_u8, BMP280_CALIB_DATA_SIZE);
 
@@ -129,7 +129,7 @@ static int bmp280_read_uncomp_pressure(const struct motion_sensor_t *s,
 	int ret;
 	uint8_t a_data_u8[BMP280_PRESSURE_DATA_SIZE] = {0};
 
-	ret = i2c_read_block__7bf(s->port, s->i2c_spi_addr__7bf,
+	ret = i2c_read_block(s->port, s->i2c_spi_addr_flags,
 			BMP280_PRESSURE_MSB_REG,
 			a_data_u8, BMP280_PRESSURE_DATA_SIZE);
 
@@ -218,13 +218,13 @@ static int bmp280_set_standby_durn(const struct motion_sensor_t *s,
 {
 	int ret, val;
 
-	ret = i2c_read8__7bf(s->port, s->i2c_spi_addr__7bf,
+	ret = i2c_read8(s->port, s->i2c_spi_addr_flags,
 			BMP280_CONFIG_REG, &val);
 
 	if (ret == EC_SUCCESS) {
 		val = (val & 0xE0) | ((durn << 5) & 0xE0);
 		/* write the standby duration*/
-		ret = i2c_write8__7bf(s->port, s->i2c_spi_addr__7bf,
+		ret = i2c_write8(s->port, s->i2c_spi_addr_flags,
 			   BMP280_CONFIG_REG, val);
 	}
 
@@ -239,7 +239,7 @@ static int bmp280_set_power_mode(const struct motion_sensor_t *s,
 	val = (BMP280_OVERSAMP_TEMP << 5) +
 		(BMP280_OVERSAMP_PRES << 2) + power_mode;
 
-	return i2c_write8__7bf(s->port, s->i2c_spi_addr__7bf,
+	return i2c_write8(s->port, s->i2c_spi_addr_flags,
 			  BMP280_CTRL_MEAS_REG, val);
 }
 
@@ -278,8 +278,8 @@ static int bmp280_init(const struct motion_sensor_t *s)
 		return EC_ERROR_INVAL;
 
 	/* Read chip id */
-	ret = i2c_read8__7bf(s->port, s->i2c_spi_addr__7bf,
-				BMP280_CHIP_ID_REG, &val);
+	ret = i2c_read8(s->port, s->i2c_spi_addr_flags,
+			BMP280_CHIP_ID_REG, &val);
 	if (ret)
 		return ret;
 
@@ -384,7 +384,7 @@ struct i2c_stress_test_dev bmp280_i2c_stress_test_dev = {
 		.read_val = BMP280_CHIP_ID,
 		.write_reg = BMP280_CONFIG_REG,
 	},
-	.i2c_read__7bf = &i2c_read8__7bf,
-	.i2c_write__7bf = &i2c_write8__7bf,
+	.i2c_read = &i2c_read8,
+	.i2c_write = &i2c_write8,
 };
 #endif /* CONFIG_CMD_I2C_STRESS_TEST_ACCEL */