diff options
| author | Dawid Niedzwiecki <dn@semihalf.com> | 2022-03-16 11:31:10 +0100 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-03-17 16:11:59 +0000 |
| commit | 02de90dc5dd322059d3636ea6b4dd222da094d8e (patch) | |
| tree | 6801805a4b9511d881afd42c3cbe8854d8cd2f95 | |
| parent | 165b1f956491a1e8d57de375bdb25c3fce2bda0d (diff) | |
| download | chrome-ec-02de90dc5dd322059d3636ea6b4dd222da094d8e.tar.gz | |
zephyr: fix checking SSFC
Update usage of cros_cbi_ssfc_check_match function after dropping a
driver model in CL:3471596
BUG=b:216802531
BRANCH=main
TEST=zmake testall
Signed-off-by: Dawid Niedzwiecki <dn@semihalf.com>
Change-Id: If90173ad0ed4a1f9e7335a7cc980cf25a707fae9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3528926
Tested-by: Dawid Niedzwiecki <dawidn@google.com>
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Commit-Queue: Dawid Niedzwiecki <dawidn@google.com>
| -rw-r--r-- | zephyr/shim/src/motionsense_sensors.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/zephyr/shim/src/motionsense_sensors.c b/zephyr/shim/src/motionsense_sensors.c index 502415d385..0cc55339df 100644 --- a/zephyr/shim/src/motionsense_sensors.c +++ b/zephyr/shim/src/motionsense_sensors.c @@ -392,9 +392,9 @@ DECLARE_HOOK(HOOK_INIT, sensor_enable_irqs, HOOK_PRIO_DEFAULT); #endif /* Handle the alternative motion sensors */ -#define CHECK_SSFC_AND_ENABLE_ALT_SENSOR(id, cbi_dev) \ +#define CHECK_SSFC_AND_ENABLE_ALT_SENSOR(id) \ do { \ - if (cros_cbi_ssfc_check_match(cbi_dev, CBI_SSFC_VALUE_ID( \ + if (cros_cbi_ssfc_check_match(CBI_SSFC_VALUE_ID( \ DT_PHANDLE(id, alternate_ssfc_indicator)))) { \ LOG_INF("Replacing \"%s\" for \"%s\" based on SSFC", \ motion_sensors[SENSOR_ID(DT_PHANDLE(id, \ @@ -404,10 +404,10 @@ DECLARE_HOOK(HOOK_INIT, sensor_enable_irqs, HOOK_PRIO_DEFAULT); } \ } while (0) -#define ALT_SENSOR_CHECK_SSFC_ID(id, cbi_dev) \ +#define ALT_SENSOR_CHECK_SSFC_ID(id) \ COND_CODE_1(UTIL_AND(DT_NODE_HAS_PROP(id, alternate_for), \ DT_NODE_HAS_PROP(id, alternate_ssfc_indicator)), \ - (CHECK_SSFC_AND_ENABLE_ALT_SENSOR(id, cbi_dev);), ()) + (CHECK_SSFC_AND_ENABLE_ALT_SENSOR(id);), ()) #if DT_NODE_EXISTS(SENSOR_ALT_NODE) @@ -432,12 +432,7 @@ int motion_sense_probe(enum sensor_alt_id alt_idx) void motion_sensors_check_ssfc(void) { - const struct device *dev = device_get_binding(CROS_CBI_LABEL); - - if (dev != NULL) { - DT_FOREACH_CHILD_VARGS(SENSOR_ALT_NODE, - ALT_SENSOR_CHECK_SSFC_ID, dev) - } + DT_FOREACH_CHILD(SENSOR_ALT_NODE, ALT_SENSOR_CHECK_SSFC_ID) } #endif /* DT_NODE_EXISTS(SENSOR_ALT_NODE) */ |