From 28576260c36079bfe4ff7dc832b2c01b4c75c773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Zi=C4=99cik?= Date: Wed, 9 Jan 2019 13:15:48 +0100 Subject: [PATCH] power: Remove sys_is_valid_power_state() interface MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Each platform is now specifying list of supported power states as a Kconfig options. Some of the specified states could be disabled in runtime. As result there is no need for the removed interface. Signed-off-by: Piotr Zięcik --- soc/arm/nordic_nrf/nrf51/power.c | 39 -------------------------- soc/arm/nordic_nrf/nrf51/soc_power.h | 5 ---- soc/arm/nordic_nrf/nrf52/power.c | 39 -------------------------- soc/arm/nordic_nrf/nrf52/soc_power.h | 5 ---- subsys/power/policy/policy_dummy.c | 6 ---- subsys/power/policy/policy_residency.c | 6 ---- 6 files changed, 100 deletions(-) diff --git a/soc/arm/nordic_nrf/nrf51/power.c b/soc/arm/nordic_nrf/nrf51/power.c index 1d8e900b8ad..0740f266055 100644 --- a/soc/arm/nordic_nrf/nrf51/power.c +++ b/soc/arm/nordic_nrf/nrf51/power.c @@ -50,42 +50,3 @@ void sys_power_state_post_ops(enum power_states state) irq_unlock(0); } -bool sys_is_valid_power_state(enum power_states state) -{ - switch (state) { -#ifdef CONFIG_SYS_POWER_LOW_POWER_STATE - #ifdef CONFIG_SYS_POWER_STATE_CPU_LPS_SUPPORTED - case SYS_POWER_STATE_CPU_LPS: - return true; - #endif - #ifdef CONFIG_SYS_POWER_STATE_CPU_LPS_1_SUPPORTED - case SYS_POWER_STATE_CPU_LPS_1: - return true; - #endif - #ifdef CONFIG_SYS_POWER_STATE_CPU_LPS_2_SUPPORTED - case SYS_POWER_STATE_CPU_LPS_2: - return true; - #endif -#endif /* CONFIG_SYS_POWER_LOW_POWER_STATE */ - -#ifdef CONFIG_SYS_POWER_DEEP_SLEEP - #ifdef CONFIG_SYS_POWER_STATE_DEEP_SLEEP_SUPPORTED - case SYS_POWER_STATE_DEEP_SLEEP: - return true; - #endif - #ifdef CONFIG_SYS_POWER_STATE_DEEP_SLEEP_1_SUPPORTED - case SYS_POWER_STATE_DEEP_SLEEP_1: - return true; - #endif - #ifdef CONFIG_SYS_POWER_STATE_DEEP_SLEEP_2_SUPPORTED - case SYS_POWER_STATE_DEEP_SLEEP_2: - return true; - #endif -#endif /* CONFIG_SYS_POWER_DEEP_SLEEP */ - - default: - return false; - } - - /* Not reached */ -} diff --git a/soc/arm/nordic_nrf/nrf51/soc_power.h b/soc/arm/nordic_nrf/nrf51/soc_power.h index 8588a82b67c..0668a290135 100644 --- a/soc/arm/nordic_nrf/nrf51/soc_power.h +++ b/soc/arm/nordic_nrf/nrf51/soc_power.h @@ -24,11 +24,6 @@ extern "C" { */ void sys_set_power_state(enum power_states state); -/** - * @brief Check the low power state is supported by SoC - */ -bool sys_is_valid_power_state(enum power_states state); - /** * @brief Do any SoC or architecture specific post ops after low power states. */ diff --git a/soc/arm/nordic_nrf/nrf52/power.c b/soc/arm/nordic_nrf/nrf52/power.c index 1d8e900b8ad..0740f266055 100644 --- a/soc/arm/nordic_nrf/nrf52/power.c +++ b/soc/arm/nordic_nrf/nrf52/power.c @@ -50,42 +50,3 @@ void sys_power_state_post_ops(enum power_states state) irq_unlock(0); } -bool sys_is_valid_power_state(enum power_states state) -{ - switch (state) { -#ifdef CONFIG_SYS_POWER_LOW_POWER_STATE - #ifdef CONFIG_SYS_POWER_STATE_CPU_LPS_SUPPORTED - case SYS_POWER_STATE_CPU_LPS: - return true; - #endif - #ifdef CONFIG_SYS_POWER_STATE_CPU_LPS_1_SUPPORTED - case SYS_POWER_STATE_CPU_LPS_1: - return true; - #endif - #ifdef CONFIG_SYS_POWER_STATE_CPU_LPS_2_SUPPORTED - case SYS_POWER_STATE_CPU_LPS_2: - return true; - #endif -#endif /* CONFIG_SYS_POWER_LOW_POWER_STATE */ - -#ifdef CONFIG_SYS_POWER_DEEP_SLEEP - #ifdef CONFIG_SYS_POWER_STATE_DEEP_SLEEP_SUPPORTED - case SYS_POWER_STATE_DEEP_SLEEP: - return true; - #endif - #ifdef CONFIG_SYS_POWER_STATE_DEEP_SLEEP_1_SUPPORTED - case SYS_POWER_STATE_DEEP_SLEEP_1: - return true; - #endif - #ifdef CONFIG_SYS_POWER_STATE_DEEP_SLEEP_2_SUPPORTED - case SYS_POWER_STATE_DEEP_SLEEP_2: - return true; - #endif -#endif /* CONFIG_SYS_POWER_DEEP_SLEEP */ - - default: - return false; - } - - /* Not reached */ -} diff --git a/soc/arm/nordic_nrf/nrf52/soc_power.h b/soc/arm/nordic_nrf/nrf52/soc_power.h index 8588a82b67c..0668a290135 100644 --- a/soc/arm/nordic_nrf/nrf52/soc_power.h +++ b/soc/arm/nordic_nrf/nrf52/soc_power.h @@ -24,11 +24,6 @@ extern "C" { */ void sys_set_power_state(enum power_states state); -/** - * @brief Check the low power state is supported by SoC - */ -bool sys_is_valid_power_state(enum power_states state); - /** * @brief Do any SoC or architecture specific post ops after low power states. */ diff --git a/subsys/power/policy/policy_dummy.c b/subsys/power/policy/policy_dummy.c index 9721b6bfbfc..bde542ec246 100644 --- a/subsys/power/policy/policy_dummy.c +++ b/subsys/power/policy/policy_dummy.c @@ -62,12 +62,6 @@ int sys_pm_policy_next_state(s32_t ticks, enum power_states *pm_state) cur_pm_idx = 0; } - if (!sys_is_valid_power_state(pm_policy[cur_pm_idx].pm_state)) { - LOG_ERR("pm_state(%d) not supported by SoC\n", - pm_policy[cur_pm_idx].pm_state); - return SYS_PM_NOT_HANDLED; - } - *pm_state = pm_policy[cur_pm_idx].pm_state; LOG_DBG("pm_state: %d, idx: %d\n", *pm_state, cur_pm_idx); diff --git a/subsys/power/policy/policy_residency.c b/subsys/power/policy/policy_residency.c index 753afd92d7f..fec7173eebc 100644 --- a/subsys/power/policy/policy_residency.c +++ b/subsys/power/policy/policy_residency.c @@ -79,12 +79,6 @@ int sys_pm_policy_next_state(s32_t ticks, enum power_states *pm_state) } } - if (!sys_is_valid_power_state(pm_policy[i].pm_state)) { - LOG_ERR("pm_state(%d) not supported by SoC\n", - pm_policy[i].pm_state); - return SYS_PM_NOT_HANDLED; - } - *pm_state = pm_policy[i].pm_state; LOG_DBG("ticks: %d, pm_state: %d, min_residency: %d, idx: %d\n", ticks, *pm_state, pm_policy[i].min_residency, i);