zephyr: emul: drop i2c_label from emul configs

This is not used anywhere and is causing problem with downstreaming
since the label is being removed.

BRANCH=none
BUG=none
TEST=zmake testall

Cq-Depend: chromium:3813331
Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Change-Id: I1b900670bde540a745648eb72e7801dec74272b3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3811111
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>

15 files changed, 0 insertions, 20 deletions

diff --git a/zephyr/emul/emul_bb_retimer.c b/zephyr/emul/emul_bb_retimer.c
index fdd9a08af5..76f40ff555 100644
--- a/zephyr/emul/emul_bb_retimer.c
+++ b/zephyr/emul/emul_bb_retimer.c
@@ -329,7 +329,6 @@ static int bb_emul_init(const struct emul *emul, const struct device *parent)
 	};         \
                                                                     \
 	static const struct i2c_common_emul_cfg bb_emul_cfg_##n = { \
-		.i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))),      \
 		.dev_label = DT_INST_LABEL(n),                      \
 		.data = &bb_emul_data_##n.common,                   \
 		.addr = DT_INST_REG_ADDR(n),                        \
diff --git a/zephyr/emul/emul_bma255.c b/zephyr/emul/emul_bma255.c
index b1b69a86ec..b1b5c0c686 100644
--- a/zephyr/emul/emul_bma255.c
+++ b/zephyr/emul/emul_bma255.c
@@ -1005,7 +1005,6 @@ static int bma_emul_init(const struct emul *emul, const struct device *parent)
 	};         \
                                                                      \
 	static const struct i2c_common_emul_cfg bma_emul_cfg_##n = { \
-		.i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))),       \
 		.dev_label = DT_INST_LABEL(n),                       \
 		.data = &bma_emul_data_##n.common,                   \
 		.addr = DT_INST_REG_ADDR(n),                         \
diff --git a/zephyr/emul/emul_bmi.c b/zephyr/emul/emul_bmi.c
index a87984ba7b..997c28c2b9 100644
--- a/zephyr/emul/emul_bmi.c
+++ b/zephyr/emul/emul_bmi.c
@@ -1079,7 +1079,6 @@ static int bmi_emul_init(const struct emul *emul, const struct device *parent)
 		},							\
 	};         \
 	static const struct i2c_common_emul_cfg bmi_emul_cfg_##n = { \
-		.i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))),       \
 		.dev_label = DT_INST_LABEL(n),                       \
 		.data = &bmi_emul_data_##n.common,                   \
 		.addr = DT_INST_REG_ADDR(n),                         \
diff --git a/zephyr/emul/emul_isl923x.c b/zephyr/emul/emul_isl923x.c
index 1822c7b268..834f7cad97 100644
--- a/zephyr/emul/emul_isl923x.c
+++ b/zephyr/emul/emul_isl923x.c
@@ -438,7 +438,6 @@ static int emul_isl923x_init(const struct emul *emul,
 	}; \
 	static struct isl923x_emul_cfg isl923x_emul_cfg_##n = {                \
 	.common = {                                                            \
-		.i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))),                 \
 		.dev_label = DT_INST_LABEL(n),                                 \
 		.addr = DT_INST_REG_ADDR(n),                                   \
 		},                                                             \
diff --git a/zephyr/emul/emul_lis2dw12.c b/zephyr/emul/emul_lis2dw12.c
index 148d2f095b..14344889da 100644
--- a/zephyr/emul/emul_lis2dw12.c
+++ b/zephyr/emul/emul_lis2dw12.c
@@ -292,7 +292,6 @@ void lis2dw12_emul_clear_accel_reading(const struct emul *emul)
 	}; \
 	static const struct lis2dw12_emul_cfg lis2dw12_emul_cfg_##n = {   \
 		.common = {                                               \
-		.i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))),            \
 			.dev_label = DT_INST_LABEL(n),                    \
 			.addr = DT_INST_REG_ADDR(n),                      \
 		},                                                        \
diff --git a/zephyr/emul/emul_ln9310.c b/zephyr/emul/emul_ln9310.c
index ba1e2d440b..bc4b243b25 100644
--- a/zephyr/emul/emul_ln9310.c
+++ b/zephyr/emul/emul_ln9310.c
@@ -504,7 +504,6 @@ static int emul_ln9310_init(const struct emul *emul,
 		.gpio_int_pin = LN9310_GET_GPIO_INT_PIN(n),		       \
 	}; \
 	static const struct i2c_common_emul_cfg ln9310_emul_cfg_##n = {          \
-		.i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))),                   \
 		.dev_label = DT_INST_LABEL(n),                                   \
 		.addr = DT_INST_REG_ADDR(n),                                     \
 	};                                                                       \
diff --git a/zephyr/emul/emul_pi3usb9201.c b/zephyr/emul/emul_pi3usb9201.c
index 685086f896..61686a1fca 100644
--- a/zephyr/emul/emul_pi3usb9201.c
+++ b/zephyr/emul/emul_pi3usb9201.c
@@ -36,8 +36,6 @@ struct pi3usb9201_emul_data {
 
 /** Static configuration for the emulator */
 struct pi3usb9201_emul_cfg {
-	/** Label of the I2C bus this emulator connects to */
-	const char *i2c_label;
 	/** Pointer to run-time data */
 	struct pi3usb9201_emul_data *data;
 	/** Address of pi3usb9201 on i2c bus */
@@ -174,7 +172,6 @@ static int pi3usb9201_emul_init(const struct emul *emul,
 #define PI3USB9201_EMUL(n)                                                  \
 	static struct pi3usb9201_emul_data pi3usb9201_emul_data_##n = {};   \
 	static const struct pi3usb9201_emul_cfg pi3usb9201_emul_cfg_##n = { \
-		.i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))),              \
 		.data = &pi3usb9201_emul_data_##n,                          \
 		.addr = DT_INST_REG_ADDR(n),                                \
 	};                                                                  \
diff --git a/zephyr/emul/emul_smart_battery.c b/zephyr/emul/emul_smart_battery.c
index 4efdbb43b9..aa75484964 100644
--- a/zephyr/emul/emul_smart_battery.c
+++ b/zephyr/emul/emul_smart_battery.c
@@ -867,7 +867,6 @@ static int sbat_emul_init(const struct emul *emul, const struct device *parent)
 	};        \
                                                                       \
 	static const struct i2c_common_emul_cfg sbat_emul_cfg_##n = { \
-		.i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))),        \
 		.dev_label = DT_INST_LABEL(n),                        \
 		.data = &sbat_emul_data_##n.common,                   \
 		.addr = DT_INST_REG_ADDR(n),                          \
diff --git a/zephyr/emul/emul_sn5s330.c b/zephyr/emul/emul_sn5s330.c
index c6e2fea84f..eb520f37af 100644
--- a/zephyr/emul/emul_sn5s330.c
+++ b/zephyr/emul/emul_sn5s330.c
@@ -346,7 +346,6 @@ static int emul_sn5s330_init(const struct emul *emul,
 	};              \
 	static struct sn5s330_emul_cfg sn5s330_emul_cfg_##n = {                \
 		.common = {                                                    \
-		.i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))),                 \
 			.dev_label = DT_INST_LABEL(n),                         \
 			.addr = DT_INST_REG_ADDR(n),                           \
 		},                                                             \
diff --git a/zephyr/emul/emul_syv682x.c b/zephyr/emul/emul_syv682x.c
index 7c289cb1ea..1e2e2b9247 100644
--- a/zephyr/emul/emul_syv682x.c
+++ b/zephyr/emul/emul_syv682x.c
@@ -268,7 +268,6 @@ static int syv682x_emul_init(const struct emul *emul,
 	}; \
 	static const struct syv682x_emul_cfg syv682x_emul_cfg_##n = {          \
 		.common = {                                                    \
-			.i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))),         \
 			.dev_label = DT_INST_LABEL(n),                         \
 			.addr = DT_INST_REG_ADDR(n),                           \
 		},                                                             \
diff --git a/zephyr/emul/emul_tcs3400.c b/zephyr/emul/emul_tcs3400.c
index cc376701d8..6501683551 100644
--- a/zephyr/emul/emul_tcs3400.c
+++ b/zephyr/emul/emul_tcs3400.c
@@ -617,7 +617,6 @@ static int tcs_emul_init(const struct emul *emul, const struct device *parent)
 	};         \
                                                                      \
 	static const struct i2c_common_emul_cfg tcs_emul_cfg_##n = { \
-		.i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))),       \
 		.dev_label = DT_INST_LABEL(n),                       \
 		.data = &tcs_emul_data_##n.common,                   \
 		.addr = DT_INST_REG_ADDR(n),                         \
diff --git a/zephyr/emul/i2c_mock.c b/zephyr/emul/i2c_mock.c
index d471aa0b92..2ee8b74227 100644
--- a/zephyr/emul/i2c_mock.c
+++ b/zephyr/emul/i2c_mock.c
@@ -58,7 +58,6 @@ static int i2c_mock_init(const struct emul *emul, const struct device *parent)
 
 #define INIT_I2C_MOCK(n)                                             \
 	static const struct i2c_common_emul_cfg i2c_mock_cfg_##n = { \
-		.i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))),       \
 		.dev_label = DT_INST_LABEL(n),                       \
 		.addr = DT_INST_REG_ADDR(n),                         \
 	};                                                           \
diff --git a/zephyr/emul/tcpc/emul_ps8xxx.c b/zephyr/emul/tcpc/emul_ps8xxx.c
index f6ce320476..ad985bb217 100644
--- a/zephyr/emul/tcpc/emul_ps8xxx.c
+++ b/zephyr/emul/tcpc/emul_ps8xxx.c
@@ -637,19 +637,16 @@ static int ps8xxx_emul_init(const struct emul *emul,
                                                                       \
 	static const struct ps8xxx_emul_cfg ps8xxx_emul_cfg_##n = {	\
 		.p0_cfg = {						\
-			.i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))),	\
 			.dev_label = DT_INST_LABEL(n),			\
 			.data = &ps8xxx_emul_data_##n.p0_data,		\
 			.addr = DT_INST_PROP(n, p0_i2c_addr),		\
 		},							\
 		.p1_cfg = {						\
-			.i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))),	\
 			.dev_label = DT_INST_LABEL(n),			\
 			.data = &ps8xxx_emul_data_##n.p1_data,		\
 			.addr = DT_INST_PROP(n, p1_i2c_addr),		\
 		},							\
 		.gpio_cfg = {						\
-			.i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))),	\
 			.dev_label = DT_INST_LABEL(n),			\
 			.data = &ps8xxx_emul_data_##n.gpio_data,	\
 			.addr = DT_INST_PROP(n, gpio_i2c_addr),		\
diff --git a/zephyr/include/emul/emul_common_i2c.h b/zephyr/include/emul/emul_common_i2c.h
index 7ab86ec868..6b4fd10b9f 100644
--- a/zephyr/include/emul/emul_common_i2c.h
+++ b/zephyr/include/emul/emul_common_i2c.h
@@ -214,8 +214,6 @@ typedef int (*i2c_common_emul_write_func)(const struct emul *target, int reg,
 
 /** Static configuration, common for all i2c emulators */
 struct i2c_common_emul_cfg {
-	/** Label of the I2C bus this emulator connects to */
-	const char *i2c_label;
 	/** Label of the I2C device being emulated */
 	const char *dev_label;
 	/** Pointer to run-time data */
diff --git a/zephyr/include/emul/tcpc/emul_tcpci.h b/zephyr/include/emul/tcpc/emul_tcpci.h
index 6964fa84d7..323860040b 100644
--- a/zephyr/include/emul/tcpc/emul_tcpci.h
+++ b/zephyr/include/emul/tcpc/emul_tcpci.h
@@ -118,7 +118,6 @@ struct tcpc_emul_data {
 		.tcpci_ctx = &tcpci_ctx##n,                                \
 		.chip_data = chip_data_ptr,                                \
 		.i2c_cfg = {                                               \
-			.i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))),     \
 			.dev_label = DT_INST_LABEL(n),                     \
 			.data = &tcpci_ctx##n.common,                      \
 			.addr = DT_INST_REG_ADDR(n),                       \