Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1362783 > unrolled thread

[PATCH] drivers: firmware: psci: make two helper functions static

Back to article view | Back to linux.kernel

Contents

  [PATCH] drivers: firmware: psci: make two helper functions static Jisheng Zhang <jszhang@marvell.com> - 2016-03-22 15:40 +0100
    Re: [PATCH] drivers: firmware: psci: make two helper functions static Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> - 2016-03-23 11:30 +0100

#1362783 — [PATCH] drivers: firmware: psci: make two helper functions static

psci_power_state_loses_context() and psci_power_state_is_valid are only
used internally now, so make them static.

Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
 drivers/firmware/psci.c | 4 ++--
 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 11bfee8..6d86881 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -91,7 +91,7 @@ static inline bool psci_has_ext_power_state(void)
 				PSCI_1_0_FEATURES_CPU_SUSPEND_PF_MASK;
 }
 
-bool psci_power_state_loses_context(u32 state)
+static bool psci_power_state_loses_context(u32 state)
 {
 	const u32 mask = psci_has_ext_power_state() ?
 					PSCI_1_0_EXT_POWER_STATE_TYPE_MASK :
@@ -100,7 +100,7 @@ bool psci_power_state_loses_context(u32 state)
 	return state & mask;
 }
 
-bool psci_power_state_is_valid(u32 state)
+static bool psci_power_state_is_valid(u32 state)
 {
 	const u32 valid_mask = psci_has_ext_power_state() ?
 			       PSCI_1_0_EXT_POWER_STATE_MASK :
diff --git a/include/linux/psci.h b/include/linux/psci.h
index 393efe2..bdea1cb 100644
--- a/include/linux/psci.h
+++ b/include/linux/psci.h
@@ -21,8 +21,6 @@
 #define PSCI_POWER_STATE_TYPE_POWER_DOWN	1
 
 bool psci_tos_resident_on(int cpu);
-bool psci_power_state_loses_context(u32 state);
-bool psci_power_state_is_valid(u32 state);
 
 int psci_cpu_init_idle(unsigned int cpu);
 int psci_cpu_suspend_enter(unsigned long index);
-- 
2.8.0.rc3

[toc] | [next] | [standalone]

#1363309

On Tue, Mar 22, 2016 at 10:31:45PM +0800, Jisheng Zhang wrote:
> psci_power_state_loses_context() and psci_power_state_is_valid are only
> used internally now, so make them static.
> 
> Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
> ---
>  drivers/firmware/psci.c | 4 ++--
>  include/linux/psci.h    | 2 --
>  2 files changed, 2 insertions(+), 4 deletions(-)

Thanks, I will apply it and send it for next cycle.

Lorenzo

> diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
> index 11bfee8..6d86881 100644
> --- a/drivers/firmware/psci.c
> +++ b/drivers/firmware/psci.c
> @@ -91,7 +91,7 @@ static inline bool psci_has_ext_power_state(void)
>  				PSCI_1_0_FEATURES_CPU_SUSPEND_PF_MASK;
>  }
>  
> -bool psci_power_state_loses_context(u32 state)
> +static bool psci_power_state_loses_context(u32 state)
>  {
>  	const u32 mask = psci_has_ext_power_state() ?
>  					PSCI_1_0_EXT_POWER_STATE_TYPE_MASK :
> @@ -100,7 +100,7 @@ bool psci_power_state_loses_context(u32 state)
>  	return state & mask;
>  }
>  
> -bool psci_power_state_is_valid(u32 state)
> +static bool psci_power_state_is_valid(u32 state)
>  {
>  	const u32 valid_mask = psci_has_ext_power_state() ?
>  			       PSCI_1_0_EXT_POWER_STATE_MASK :
> diff --git a/include/linux/psci.h b/include/linux/psci.h
> index 393efe2..bdea1cb 100644
> --- a/include/linux/psci.h
> +++ b/include/linux/psci.h
> @@ -21,8 +21,6 @@
>  #define PSCI_POWER_STATE_TYPE_POWER_DOWN	1
>  
>  bool psci_tos_resident_on(int cpu);
> -bool psci_power_state_loses_context(u32 state);
> -bool psci_power_state_is_valid(u32 state);
>  
>  int psci_cpu_init_idle(unsigned int cpu);
>  int psci_cpu_suspend_enter(unsigned long index);
> -- 
> 2.8.0.rc3
> 

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web