| From ac926e83708bf51d4226e7b0eb932daa8acd0825 Mon Sep 17 00:00:00 2001 |
| From: Stratos Karafotis <stratosk@semaphore.gr> |
| Date: Fri, 25 Apr 2014 23:16:58 +0300 |
| Subject: sh: clk: Use cpufreq_for_each_valid_entry macro for iteration |
| |
| The cpufreq core now supports the cpufreq_for_each_valid_entry macro |
| helper for iteration over the cpufreq_frequency_table, so use it. |
| |
| It should have no functional changes. |
| |
| Signed-off-by: Stratos Karafotis <stratosk@semaphore.gr> |
| Acked-by: Viresh Kumar <viresh.kumar@linaro.org> |
| Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> |
| (cherry picked from commit 4229e1c61a4a7ac21d5d0790f6add1c9b98d33e7) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/sh/clk/core.c | 20 +++++--------------- |
| 1 file changed, 5 insertions(+), 15 deletions(-) |
| |
| diff --git a/drivers/sh/clk/core.c b/drivers/sh/clk/core.c |
| index 74727851820d..be56b22ca941 100644 |
| --- a/drivers/sh/clk/core.c |
| +++ b/drivers/sh/clk/core.c |
| @@ -196,17 +196,11 @@ int clk_rate_table_find(struct clk *clk, |
| struct cpufreq_frequency_table *freq_table, |
| unsigned long rate) |
| { |
| - int i; |
| - |
| - for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) { |
| - unsigned long freq = freq_table[i].frequency; |
| + struct cpufreq_frequency_table *pos; |
| |
| - if (freq == CPUFREQ_ENTRY_INVALID) |
| - continue; |
| - |
| - if (freq == rate) |
| - return i; |
| - } |
| + cpufreq_for_each_valid_entry(pos, freq_table) |
| + if (pos->frequency == rate) |
| + return pos - freq_table; |
| |
| return -ENOENT; |
| } |
| @@ -575,11 +569,7 @@ long clk_round_parent(struct clk *clk, unsigned long target, |
| return abs(target - *best_freq); |
| } |
| |
| - for (freq = parent->freq_table; freq->frequency != CPUFREQ_TABLE_END; |
| - freq++) { |
| - if (freq->frequency == CPUFREQ_ENTRY_INVALID) |
| - continue; |
| - |
| + cpufreq_for_each_valid_entry(freq, parent->freq_table) { |
| if (unlikely(freq->frequency / target <= div_min - 1)) { |
| unsigned long freq_max; |
| |
| -- |
| 2.1.2 |
| |