From 2a69f31eb0d3af1290152afb1517142100b3316d Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Mon, 22 Mar 2021 10:31:55 -0400 Subject: refactor(core): Move away from deprecated DT API. * Move to `DEVICE_DT_INST_DEFINE` everywhere. See: https://docs.zephyrproject.org/2.5.0/releases/release-notes-2.5.html#deprecated-in-this-release PR: https://github.com/zmkfirmware/zmk/pull/736 --- app/src/ext_power_generic.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'app/src/ext_power_generic.c') diff --git a/app/src/ext_power_generic.c b/app/src/ext_power_generic.c index 1f2e0d7..7464d42 100644 --- a/app/src/ext_power_generic.c +++ b/app/src/ext_power_generic.c @@ -231,13 +231,7 @@ static const struct ext_power_api api = {.enable = ext_power_generic_enable, #define ZMK_EXT_POWER_INIT_PRIORITY 81 -#ifdef CONFIG_DEVICE_POWER_MANAGEMENT -DEVICE_DEFINE(ext_power_generic, DT_INST_LABEL(0), ext_power_generic_init, - &ext_power_generic_pm_control, &data, &config, POST_KERNEL, - ZMK_EXT_POWER_INIT_PRIORITY, &api); -#else -DEVICE_AND_API_INIT(ext_power_generic, DT_INST_LABEL(0), ext_power_generic_init, &data, &config, - POST_KERNEL, ZMK_EXT_POWER_INIT_PRIORITY, &api); -#endif /* CONFIG_DEVICE_POWER_MANAGEMENT */ +DEVICE_DT_INST_DEFINE(0, ext_power_generic_init, &ext_power_generic_pm_control, &data, &config, + POST_KERNEL, ZMK_EXT_POWER_INIT_PRIORITY, &api); #endif /* DT_HAS_COMPAT_STATUS_OKAY(DT_DRV_COMPAT) */ -- cgit v1.2.3