From 33c959d0318a60a02e016f01adafaf71f4613fc9 Mon Sep 17 00:00:00 2001 From: innovaker <66737976+innovaker@users.noreply.github.com> Date: Wed, 18 Nov 2020 16:12:13 +0000 Subject: [PATCH] refactor(app): replace `driver_api` with `api` See: https://docs.zephyrproject.org/latest/releases/release-notes-2.4.html PR: #467 --- app/include/drivers/behavior.h | 6 +++--- app/include/drivers/ext_power.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/include/drivers/behavior.h b/app/include/drivers/behavior.h index d90897d0..56ff7afc 100644 --- a/app/include/drivers/behavior.h +++ b/app/include/drivers/behavior.h @@ -49,7 +49,7 @@ __syscall int behavior_keymap_binding_pressed(struct zmk_behavior_binding *bindi static inline int z_impl_behavior_keymap_binding_pressed(struct zmk_behavior_binding *binding, struct zmk_behavior_binding_event event) { struct device *dev = device_get_binding(binding->behavior_dev); - const struct behavior_driver_api *api = (const struct behavior_driver_api *)dev->driver_api; + const struct behavior_driver_api *api = (const struct behavior_driver_api *)dev->api; if (api->binding_pressed == NULL) { return -ENOTSUP; @@ -72,7 +72,7 @@ __syscall int behavior_keymap_binding_released(struct zmk_behavior_binding *bind static inline int z_impl_behavior_keymap_binding_released(struct zmk_behavior_binding *binding, struct zmk_behavior_binding_event event) { struct device *dev = device_get_binding(binding->behavior_dev); - const struct behavior_driver_api *api = (const struct behavior_driver_api *)dev->driver_api; + const struct behavior_driver_api *api = (const struct behavior_driver_api *)dev->api; if (api->binding_released == NULL) { return -ENOTSUP; @@ -98,7 +98,7 @@ static inline int z_impl_behavior_sensor_keymap_binding_triggered(struct zmk_behavior_binding *binding, struct device *sensor, int64_t timestamp) { struct device *dev = device_get_binding(binding->behavior_dev); - const struct behavior_driver_api *api = (const struct behavior_driver_api *)dev->driver_api; + const struct behavior_driver_api *api = (const struct behavior_driver_api *)dev->api; if (api->sensor_binding_triggered == NULL) { return -ENOTSUP; diff --git a/app/include/drivers/ext_power.h b/app/include/drivers/ext_power.h index 6c1923e8..ddc85a35 100644 --- a/app/include/drivers/ext_power.h +++ b/app/include/drivers/ext_power.h @@ -45,7 +45,7 @@ __subsystem struct ext_power_api { __syscall int ext_power_enable(struct device *dev); static inline int z_impl_ext_power_enable(struct device *dev) { - const struct ext_power_api *api = (const struct ext_power_api *)dev->driver_api; + const struct ext_power_api *api = (const struct ext_power_api *)dev->api; if (api->enable == NULL) { return -ENOTSUP; @@ -64,7 +64,7 @@ static inline int z_impl_ext_power_enable(struct device *dev) { __syscall int ext_power_disable(struct device *dev); static inline int z_impl_ext_power_disable(struct device *dev) { - const struct ext_power_api *api = (const struct ext_power_api *)dev->driver_api; + const struct ext_power_api *api = (const struct ext_power_api *)dev->api; if (api->disable == NULL) { return -ENOTSUP; @@ -84,7 +84,7 @@ static inline int z_impl_ext_power_disable(struct device *dev) { __syscall int ext_power_get(struct device *dev); static inline int z_impl_ext_power_get(struct device *dev) { - const struct ext_power_api *api = (const struct ext_power_api *)dev->driver_api; + const struct ext_power_api *api = (const struct ext_power_api *)dev->api; if (api->get == NULL) { return -ENOTSUP;