diff options
| -rw-r--r-- | drivers/firmware/psci.c | 4 | ||||
| -rw-r--r-- | include/linux/psci.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index 0ab477ba6564..04f2ac54e5ab 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c | |||
| @@ -91,7 +91,7 @@ static inline bool psci_has_ext_power_state(void) | |||
| 91 | PSCI_1_0_FEATURES_CPU_SUSPEND_PF_MASK; | 91 | PSCI_1_0_FEATURES_CPU_SUSPEND_PF_MASK; |
| 92 | } | 92 | } |
| 93 | 93 | ||
| 94 | bool psci_power_state_loses_context(u32 state) | 94 | static bool psci_power_state_loses_context(u32 state) |
| 95 | { | 95 | { |
| 96 | const u32 mask = psci_has_ext_power_state() ? | 96 | const u32 mask = psci_has_ext_power_state() ? |
| 97 | PSCI_1_0_EXT_POWER_STATE_TYPE_MASK : | 97 | PSCI_1_0_EXT_POWER_STATE_TYPE_MASK : |
| @@ -100,7 +100,7 @@ bool psci_power_state_loses_context(u32 state) | |||
| 100 | return state & mask; | 100 | return state & mask; |
| 101 | } | 101 | } |
| 102 | 102 | ||
| 103 | bool psci_power_state_is_valid(u32 state) | 103 | static bool psci_power_state_is_valid(u32 state) |
| 104 | { | 104 | { |
| 105 | const u32 valid_mask = psci_has_ext_power_state() ? | 105 | const u32 valid_mask = psci_has_ext_power_state() ? |
| 106 | PSCI_1_0_EXT_POWER_STATE_MASK : | 106 | PSCI_1_0_EXT_POWER_STATE_MASK : |
diff --git a/include/linux/psci.h b/include/linux/psci.h index 393efe2edf9a..bdea1cb5e1db 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h | |||
| @@ -21,8 +21,6 @@ | |||
| 21 | #define PSCI_POWER_STATE_TYPE_POWER_DOWN 1 | 21 | #define PSCI_POWER_STATE_TYPE_POWER_DOWN 1 |
| 22 | 22 | ||
| 23 | bool psci_tos_resident_on(int cpu); | 23 | bool psci_tos_resident_on(int cpu); |
| 24 | bool psci_power_state_loses_context(u32 state); | ||
| 25 | bool psci_power_state_is_valid(u32 state); | ||
| 26 | 24 | ||
| 27 | int psci_cpu_init_idle(unsigned int cpu); | 25 | int psci_cpu_init_idle(unsigned int cpu); |
| 28 | int psci_cpu_suspend_enter(unsigned long index); | 26 | int psci_cpu_suspend_enter(unsigned long index); |
