From 0e978fb1e662d8cadb153cf3e5d3ee0f67eeb6e9 Mon Sep 17 00:00:00 2001 From: TOKITA Hiroshi Date: Sat, 30 Nov 2024 13:15:08 +0900 Subject: [PATCH] drivers: sensor: scd4x: Fix to allow the use of multiple models Compilation will fail if multiple models are used at the same time. Changing to define different unique names for the symbols to avoid conflicts. Signed-off-by: TOKITA Hiroshi --- drivers/sensor/sensirion/scd4x/scd4x.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/sensor/sensirion/scd4x/scd4x.c b/drivers/sensor/sensirion/scd4x/scd4x.c index bc9edead01d..e989c155d50 100644 --- a/drivers/sensor/sensirion/scd4x/scd4x.c +++ b/drivers/sensor/sensirion/scd4x/scd4x.c @@ -889,14 +889,14 @@ static DEVICE_API(sensor, scd4x_api_funcs) = { }; #define SCD4X_INIT(inst, scd4x_model) \ - static struct scd4x_data scd4x_data_##inst; \ - static const struct scd4x_config scd4x_config_##inst = { \ + static struct scd4x_data scd4x_data_##scd4x_model##_##inst; \ + static const struct scd4x_config scd4x_config_##scd4x_model##_##inst = { \ .bus = I2C_DT_SPEC_INST_GET(inst), \ .model = scd4x_model, \ .mode = DT_INST_ENUM_IDX_OR(inst, mode, SCD4X_MODE_NORMAL), \ }; \ - SENSOR_DEVICE_DT_INST_DEFINE(inst, scd4x_init, NULL, &scd4x_data_##inst, \ - &scd4x_config_##inst, POST_KERNEL, \ + SENSOR_DEVICE_DT_INST_DEFINE(inst, scd4x_init, NULL, &scd4x_data_##scd4x_model##_##inst, \ + &scd4x_config_##scd4x_model##_##inst, POST_KERNEL, \ CONFIG_SENSOR_INIT_PRIORITY, &scd4x_api_funcs); #define DT_DRV_COMPAT sensirion_scd40