Commit db5f2995 authored Jan 02, 2015 by Viresh Kumar Committed by Rafael J. Wysocki Jan 23, 2015

cpufreq: merge 'if' blocks in __cpufreq_remove_dev_prepare()

There are two 'if' blocks here, checking for !cpufreq_driver->setpolicy and
has_target(). Both are actually doing the same thing, merge them.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 09347b29

drivers/cpufreq/cpufreq.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1371,11 +1371,10 @@ static int __cpufreq_remove_dev_prepare(struct device *dev,
		pr_err("%s: Failed to stop governor\n", __func__);
		return ret;
		}
		}

		if (!cpufreq_driver->setpolicy)
		strncpy(per_cpu(cpufreq_cpu_governor, cpu),
		policy->governor->name, CPUFREQ_NAME_LEN);
		}

		down_read(&policy->rwsem);
		cpus = cpumask_weight(policy->cpus);