aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firmware/psci.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-04-25 20:13:30 -0400
committerArnd Bergmann <arnd@arndb.de>2016-04-25 20:13:30 -0400
commit2b9cf18982b0ba7317f258663560e181594a9bf8 (patch)
tree0aee02c09996e15503fb0533bce7f7886e5c74b4 /drivers/firmware/psci.c
parentc5f9d6b1379a4584b47dd80271ab3a6883f979a9 (diff)
drivers: firmware: psci: make two helper functions inline
The previous patch marked these two as 'static' which showed that they are sometimes unused: drivers/firmware/psci.c:103:13: error: 'psci_power_state_is_valid' defined but not used [-Werror=unused-function] static bool psci_power_state_is_valid(u32 state) drivers/firmware/psci.c:94:13: error: 'psci_power_state_loses_context' defined but not used [-Werror=unused-function] static bool psci_power_state_loses_context(u32 state) This also marks the functions 'inline', which has the main effect of silently ignoring them when they are unused. The compiler will typically inline small static functions anyway, so this seems more appropriate than using __maybe_unused, which would have the same result otherwise. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: 21e8868 ("drivers: firmware: psci: make two helper functions static")
Diffstat (limited to 'drivers/firmware/psci.c')
-rw-r--r--drivers/firmware/psci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index 04f2ac54e5ab..89fcbddefb0a 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
94static bool psci_power_state_loses_context(u32 state) 94static inline 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 @@ static bool psci_power_state_loses_context(u32 state)
100 return state & mask; 100 return state & mask;
101} 101}
102 102
103static bool psci_power_state_is_valid(u32 state) 103static inline 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 :