diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2015-08-10 02:12:25 -0400 |
|---|---|---|
| committer | MyungJoo Ham <myungjoo.ham@samsung.com> | 2015-09-11 01:23:21 -0400 |
| commit | 9348da2f1c2ca8e064d4907cdc5b3a19477df933 (patch) | |
| tree | 7c0d99dcc2a1bde89f84498d3272b4be08322c12 /drivers/devfreq | |
| parent | 86fa4cdb0f1e16d7e27278e29e4f0b9ba22f1a9b (diff) | |
PM / devfreq: Drop unlikely before IS_ERR(_OR_NULL)
IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there
is no need to do that again from its callers. Drop it.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
Diffstat (limited to 'drivers/devfreq')
| -rw-r--r-- | drivers/devfreq/devfreq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index ca1b362d77e2..f28a1fae5691 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c | |||
| @@ -53,7 +53,7 @@ static struct devfreq *find_device_devfreq(struct device *dev) | |||
| 53 | { | 53 | { |
| 54 | struct devfreq *tmp_devfreq; | 54 | struct devfreq *tmp_devfreq; |
| 55 | 55 | ||
| 56 | if (unlikely(IS_ERR_OR_NULL(dev))) { | 56 | if (IS_ERR_OR_NULL(dev)) { |
| 57 | pr_err("DEVFREQ: %s: Invalid parameters\n", __func__); | 57 | pr_err("DEVFREQ: %s: Invalid parameters\n", __func__); |
| 58 | return ERR_PTR(-EINVAL); | 58 | return ERR_PTR(-EINVAL); |
| 59 | } | 59 | } |
| @@ -133,7 +133,7 @@ static struct devfreq_governor *find_devfreq_governor(const char *name) | |||
| 133 | { | 133 | { |
| 134 | struct devfreq_governor *tmp_governor; | 134 | struct devfreq_governor *tmp_governor; |
| 135 | 135 | ||
| 136 | if (unlikely(IS_ERR_OR_NULL(name))) { | 136 | if (IS_ERR_OR_NULL(name)) { |
| 137 | pr_err("DEVFREQ: %s: Invalid parameters\n", __func__); | 137 | pr_err("DEVFREQ: %s: Invalid parameters\n", __func__); |
| 138 | return ERR_PTR(-EINVAL); | 138 | return ERR_PTR(-EINVAL); |
| 139 | } | 139 | } |
