[PATCH] cpufreq: intel_pstate: Remove sample parameter in intel_pstate_calc_busy

[PATCH] cpufreq: intel_pstate: Remove sample parameter in intel_pstate_calc_busy

[Stratos Karafotis]

Since commit d37e2b7644 ("intel_pstate: remove unneeded sample buffers")
we use only one sample. So, there is no need to pass the sample
pointer to intel_pstate_calc_busy. Instead, get the pointer from
cpudata. Also, remove the unused SAMPLE_COUNT macro.

While at it, reformat the first line in this function.

Signed-off-by: Stratos Karafotis <stratosk@semaphore.gr>
---
 drivers/cpufreq/intel_pstate.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 95b3958..8192ff1 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -32,8 +32,6 @@
 #include <asm/msr.h>
 #include <asm/cpu_device_id.h>
 
-#define SAMPLE_COUNT		3
-
 #define BYT_RATIOS		0x66a
 #define BYT_VIDS		0x66b
 #define BYT_TURBO_RATIOS	0x66c
@@ -553,14 +551,13 @@ static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
 	intel_pstate_set_pstate(cpu, cpu->pstate.max_pstate);
 }
 
-static inline void intel_pstate_calc_busy(struct cpudata *cpu,
-					struct sample *sample)
+static inline void intel_pstate_calc_busy(struct cpudata *cpu)
 {
+	struct sample *sample = &cpu->sample;
 	int32_t core_pct;
 	int32_t c0_pct;
 
-	core_pct = div_fp(int_tofp((sample->aperf)),
-			int_tofp((sample->mperf)));
+	core_pct = div_fp(int_tofp(sample->aperf), int_tofp(sample->mperf));
 	core_pct = mul_fp(core_pct, int_tofp(100));
 	FP_ROUNDUP(core_pct);
 
@@ -595,7 +592,7 @@ static inline void intel_pstate_sample(struct cpudata *cpu)
 	cpu->sample.mperf -= cpu->prev_mperf;
 	cpu->sample.tsc -= cpu->prev_tsc;
 
-	intel_pstate_calc_busy(cpu, &cpu->sample);
+	intel_pstate_calc_busy(cpu);
 
 	cpu->prev_aperf = aperf;
 	cpu->prev_mperf = mperf;
-- 
1.9.0

Re: [PATCH] cpufreq: intel_pstate: Remove sample parameter in intel_pstate_calc_busy

[Viresh Kumar]

On 29 April 2014 23:23, Stratos Karafotis <stratosk@semaphore.gr> wrote:
> Since commit d37e2b7644 ("intel_pstate: remove unneeded sample buffers")
> we use only one sample. So, there is no need to pass the sample
> pointer to intel_pstate_calc_busy. Instead, get the pointer from
> cpudata. Also, remove the unused SAMPLE_COUNT macro.
>
> While at it, reformat the first line in this function.
>
> Signed-off-by: Stratos Karafotis <stratosk@semaphore.gr>
> ---
>  drivers/cpufreq/intel_pstate.c | 11 ++++-------
>  1 file changed, 4 insertions(+), 7 deletions(-)

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>

Re: [PATCH] cpufreq: intel_pstate: Remove sample parameter in intel_pstate_calc_busy

[Dirk Brandewie]

On 04/29/2014 10:53 AM, Stratos Karafotis wrote:
> Since commit d37e2b7644 ("intel_pstate: remove unneeded sample buffers")
> we use only one sample. So, there is no need to pass the sample
> pointer to intel_pstate_calc_busy. Instead, get the pointer from
> cpudata. Also, remove the unused SAMPLE_COUNT macro.
>
> While at it, reformat the first line in this function.
>
> Signed-off-by: Stratos Karafotis <stratosk@semaphore.gr>

Acked-by: Dirk Brandewie <dirk.j.brandewie@intel.com>

> ---
>   drivers/cpufreq/intel_pstate.c | 11 ++++-------
>   1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
> index 95b3958..8192ff1 100644
> --- a/drivers/cpufreq/intel_pstate.c
> +++ b/drivers/cpufreq/intel_pstate.c
> @@ -32,8 +32,6 @@
>   #include <asm/msr.h>
>   #include <asm/cpu_device_id.h>
>
> -#define SAMPLE_COUNT		3
> -
>   #define BYT_RATIOS		0x66a
>   #define BYT_VIDS		0x66b
>   #define BYT_TURBO_RATIOS	0x66c
> @@ -553,14 +551,13 @@ static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
>   	intel_pstate_set_pstate(cpu, cpu->pstate.max_pstate);
>   }
>
> -static inline void intel_pstate_calc_busy(struct cpudata *cpu,
> -					struct sample *sample)
> +static inline void intel_pstate_calc_busy(struct cpudata *cpu)
>   {
> +	struct sample *sample = &cpu->sample;
>   	int32_t core_pct;
>   	int32_t c0_pct;
>
> -	core_pct = div_fp(int_tofp((sample->aperf)),
> -			int_tofp((sample->mperf)));
> +	core_pct = div_fp(int_tofp(sample->aperf), int_tofp(sample->mperf));
>   	core_pct = mul_fp(core_pct, int_tofp(100));
>   	FP_ROUNDUP(core_pct);
>
> @@ -595,7 +592,7 @@ static inline void intel_pstate_sample(struct cpudata *cpu)
>   	cpu->sample.mperf -= cpu->prev_mperf;
>   	cpu->sample.tsc -= cpu->prev_tsc;
>
> -	intel_pstate_calc_busy(cpu, &cpu->sample);
> +	intel_pstate_calc_busy(cpu);
>
>   	cpu->prev_aperf = aperf;
>   	cpu->prev_mperf = mperf;
>