diff options
| author | Jack Rosenthal <jrosenth@chromium.org> | 2021-08-10 13:10:13 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-08-11 08:38:54 +0000 |
| commit | b1acee1aaaac4ba63a83740ca7d1e2cf7e910843 (patch) | |
| tree | 9adf244d99571d01807a8947a2c1ecab2883ff15 /zephyr/shim/src | |
| parent | 154a67d21fbbb0aabdb1520551014d57be6aa690 (diff) | |
| download | chrome-ec-b1acee1aaaac4ba63a83740ca7d1e2cf7e910843.tar.gz | |
zephyr: cleanup Zephyr v2.5 ifdefs
We no longer support version 2.5. Drop these obsolete ifdefs.
BUG=b:195571108
BRANCH=none
TEST=zmake testall
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I85985108bcf175a2756a2f8096b0aa9e3c22fce5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3086368
Reviewed-by: Keith Short <keithshort@chromium.org>
Reviewed-by: Fabio Baltieri <fabiobaltieri@google.com>
Diffstat (limited to 'zephyr/shim/src')
| -rw-r--r-- | zephyr/shim/src/gpio.c | 6 | ||||
| -rw-r--r-- | zephyr/shim/src/hooks.c | 12 |
2 files changed, 0 insertions, 18 deletions
diff --git a/zephyr/shim/src/gpio.c b/zephyr/shim/src/gpio.c index cc2baa0fe7..5348133ead 100644 --- a/zephyr/shim/src/gpio.c +++ b/zephyr/shim/src/gpio.c @@ -303,13 +303,7 @@ static int init_gpios(const struct device *unused) ~(GPIO_OUTPUT_INIT_LOW | GPIO_OUTPUT_INIT_HIGH); } -#if IS_ZEPHYR_VERSION(2, 6) rv = gpio_pin_configure(data[i].dev, configs[i].pin, flags); -#elif IS_ZEPHYR_VERSION(2, 5) - rv = gpio_config(data[i].dev, configs[i].pin, flags); -#else -#error "Unsupported zephyr version" -#endif if (rv < 0) { LOG_ERR("Config failed %s (%d)", configs[i].name, rv); } diff --git a/zephyr/shim/src/hooks.c b/zephyr/shim/src/hooks.c index 2ec19304d3..8bbd7bed05 100644 --- a/zephyr/shim/src/hooks.c +++ b/zephyr/shim/src/hooks.c @@ -15,25 +15,13 @@ int hook_call_deferred(const struct deferred_data *data, int us) { -#if IS_ZEPHYR_VERSION(2, 6) struct k_work_delayable *work = data->work; -#else - struct k_delayed_work *work = data->work; -#endif int rv = 0; if (us == -1) { -#if IS_ZEPHYR_VERSION(2, 6) k_work_cancel_delayable(work); -#else - k_delayed_work_cancel(work); -#endif } else if (us >= 0) { -#if IS_ZEPHYR_VERSION(2, 6) rv = k_work_schedule(work, K_USEC(us)); -#else - rv = k_delayed_work_submit(work, K_USEC(us)); -#endif if (rv == -EINVAL) { /* Already processing or completed. */ return 0; |