diff options
| author | Viresh Kumar | 2017-02-07 05:10:01 +0100 |
|---|---|---|
| committer | Zhang Rui | 2017-03-13 03:06:26 +0100 |
| commit | a4e49c9bc98d099b2a19933b9da55cd0ad1da421 (patch) | |
| tree | 61555a7b33547902d9ceba966e794b76e8640cc7 | |
| parent | thermal: Fix potential deadlock in cpu_cooling (diff) | |
| download | kernel-qcow2-linux-a4e49c9bc98d099b2a19933b9da55cd0ad1da421.tar.gz kernel-qcow2-linux-a4e49c9bc98d099b2a19933b9da55cd0ad1da421.tar.xz kernel-qcow2-linux-a4e49c9bc98d099b2a19933b9da55cd0ad1da421.zip | |
thermal: devfreq: Simplify expression
There is no need to check for IS_ERR() as we are looking for a very
particular error value here. Drop the first check.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
| -rw-r--r-- | drivers/thermal/devfreq_cooling.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/devfreq_cooling.c b/drivers/thermal/devfreq_cooling.c index 7743a78d4723..4793fc7b06dd 100644 --- a/drivers/thermal/devfreq_cooling.c +++ b/drivers/thermal/devfreq_cooling.c @@ -186,7 +186,7 @@ get_static_power(struct devfreq_cooling_device *dfc, unsigned long freq) return 0; opp = dev_pm_opp_find_freq_exact(dev, freq, true); - if (IS_ERR(opp) && (PTR_ERR(opp) == -ERANGE)) + if (PTR_ERR(opp) == -ERANGE) opp = dev_pm_opp_find_freq_exact(dev, freq, false); voltage = dev_pm_opp_get_voltage(opp) / 1000; /* mV */ |