On Thu, 2016-05-12 at 00:46 +0200, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wyso...@intel.com>
>
> One of the if () statements in intel_pstate_set_policy() causes
> another if () to be evaluated if the condition is true and it
> doesn't do anything else, so merge the two if () statements into
> one.
>
> No functional changes.
>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wyso...@intel.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruv...@linux.intel.com>
> ---
> drivers/cpufreq/intel_pstate.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> Index: linux-pm/drivers/cpufreq/intel_pstate.c
> ===================================================================
> --- linux-pm.orig/drivers/cpufreq/intel_pstate.c
> +++ linux-pm/drivers/cpufreq/intel_pstate.c
> @@ -1449,12 +1449,11 @@ static int intel_pstate_set_policy(struc
> intel_pstate_clear_update_util_hook(policy->cpu);
>
> cpu = all_cpu_data[0];
> - if (cpu->pstate.max_pstate_physical > cpu-
> >pstate.max_pstate) {
> - if (policy->max < policy->cpuinfo.max_freq &&
> - policy->max > cpu->pstate.max_pstate * cpu-
> >pstate.scaling) {
> - pr_debug("policy->max > max non turbo
> frequency\n");
> - policy->max = policy->cpuinfo.max_freq;
> - }
> + if (cpu->pstate.max_pstate_physical > cpu->pstate.max_pstate
> &&
> + policy->max < policy->cpuinfo.max_freq &&
> + policy->max > cpu->pstate.max_pstate * cpu-
> >pstate.scaling) {
> + pr_debug("policy->max > max non turbo frequency\n");
> + policy->max = policy->cpuinfo.max_freq;
> }
>
> if (policy->policy == CPUFREQ_POLICY_PERFORMANCE) {
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pm"
> in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
