aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cpufreq/cpufreq.c
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2016-06-03 01:28:51 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-06-08 18:58:06 -0400
commitd218ed773915a2b762d132be6bb765637338c360 (patch)
tree12e1e64d24fc80cbadff5285a439d441ed186c2f /drivers/cpufreq/cpufreq.c
parent2372784542cb7a8b256a740840abf4503de0d669 (diff)
cpufreq: Return index from cpufreq_frequency_table_target()
This routine can't fail unless the frequency table is invalid and doesn't contain any valid entries. Make it return the index and WARN() in case it is used for an invalid table. 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/cpufreq.c')
-rw-r--r--drivers/cpufreq/cpufreq.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 1685e930770f..07c933c6c29a 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1914,7 +1914,7 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy,
1914 unsigned int relation) 1914 unsigned int relation)
1915{ 1915{
1916 unsigned int old_target_freq = target_freq; 1916 unsigned int old_target_freq = target_freq;
1917 int index, retval; 1917 int index;
1918 1918
1919 if (cpufreq_disabled()) 1919 if (cpufreq_disabled())
1920 return -ENODEV; 1920 return -ENODEV;
@@ -1943,12 +1943,7 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy,
1943 if (!cpufreq_driver->target_index) 1943 if (!cpufreq_driver->target_index)
1944 return -EINVAL; 1944 return -EINVAL;
1945 1945
1946 retval = cpufreq_frequency_table_target(policy, target_freq, relation, 1946 index = cpufreq_frequency_table_target(policy, target_freq, relation);
1947 &index);
1948 if (unlikely(retval)) {
1949 pr_err("%s: Unable to find matching freq\n", __func__);
1950 return retval;
1951 }
1952 1947
1953 return __target_index(policy, index); 1948 return __target_index(policy, index);
1954} 1949}