diff options
Diffstat (limited to 'lib/psci')
| -rw-r--r-- | lib/psci/psci_common.c | 4 | ||||
| -rw-r--r-- | lib/psci/psci_main.c | 2 | ||||
| -rw-r--r-- | lib/psci/psci_private.h | 7 |
3 files changed, 7 insertions, 6 deletions
diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c index 59c9c686..ec74a8cd 100644 --- a/lib/psci/psci_common.c +++ b/lib/psci/psci_common.c @@ -267,7 +267,7 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, static plat_local_state_t get_non_cpu_pd_node_local_state( unsigned int parent_idx) { -#if !USE_COHERENT_MEM || !HW_ASSISTED_COHERENCY +#if !(USE_COHERENT_MEM || HW_ASSISTED_COHERENCY) flush_dcache_range( (uintptr_t) &psci_non_cpu_pd_nodes[parent_idx], sizeof(psci_non_cpu_pd_nodes[parent_idx])); @@ -283,7 +283,7 @@ static void set_non_cpu_pd_node_local_state(unsigned int parent_idx, plat_local_state_t state) { psci_non_cpu_pd_nodes[parent_idx].local_state = state; -#if !USE_COHERENT_MEM || !HW_ASSISTED_COHERENCY +#if !(USE_COHERENT_MEM || HW_ASSISTED_COHERENCY) flush_dcache_range( (uintptr_t) &psci_non_cpu_pd_nodes[parent_idx], sizeof(psci_non_cpu_pd_nodes[parent_idx])); diff --git a/lib/psci/psci_main.c b/lib/psci/psci_main.c index 6a35ff6f..fd822bcf 100644 --- a/lib/psci/psci_main.c +++ b/lib/psci/psci_main.c @@ -82,7 +82,7 @@ int psci_cpu_suspend(unsigned int power_state, } /* Fast path for CPU standby.*/ - if (is_cpu_standby_req(is_power_down_state, target_pwrlvl) != 0) { + if (is_cpu_standby_req(is_power_down_state, target_pwrlvl)) { if (psci_plat_pm_ops->cpu_standby == NULL) return PSCI_E_INVALID_PARAMS; diff --git a/lib/psci/psci_private.h b/lib/psci/psci_private.h index 2ea9f76c..82b951db 100644 --- a/lib/psci/psci_private.h +++ b/lib/psci/psci_private.h @@ -14,6 +14,7 @@ #include <cpu_data.h> #include <psci.h> #include <spinlock.h> +#include <stdbool.h> /* * The PSCI capability which are provided by the generic code but does not @@ -93,10 +94,10 @@ static inline plat_local_state_t psci_get_cpu_local_state_by_idx(int idx) } /* Helper function to identify a CPU standby request in PSCI Suspend call */ -static inline int is_cpu_standby_req(unsigned int is_power_down_state, - unsigned int retn_lvl) +static inline bool is_cpu_standby_req(unsigned int is_power_down_state, + unsigned int retn_lvl) { - return ((is_power_down_state == 0U) && (retn_lvl == 0U)) ? 1 : 0; + return (is_power_down_state == 0U) && (retn_lvl == 0U); } /******************************************************************************* |