diff options
| author | Viresh Kumar | 2015-01-02 08:04:25 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki | 2015-01-23 22:49:33 +0100 |
| commit | db5f299574267c50067b967f898633d4dec7ecc4 (patch) | |
| tree | 2e43bcdfc8f54b4c363ec8b009a3d891fb10d24b /drivers/cpufreq | |
| parent | cpufreq: don't need line break in show_scaling_cur_freq() (diff) | |
| download | kernel-qcow2-linux-db5f299574267c50067b967f898633d4dec7ecc4.tar.gz kernel-qcow2-linux-db5f299574267c50067b967f898633d4dec7ecc4.tar.xz kernel-qcow2-linux-db5f299574267c50067b967f898633d4dec7ecc4.zip | |
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>
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/cpufreq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 4c70f7aa9b1e..626ef841479a 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -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); |