Merge branch 'pm-cpufreq'

* pm-cpufreq: (28 commits)
  cpufreq: handle calls to ->target_index() in separate routine
  cpufreq: s5pv210: drop check for CONFIG_PM_VERBOSE
  cpufreq: intel_pstate: Remove unused member name of cpudata
  cpufreq: Break out early when frequency equals target_freq
  cpufreq: Tegra: drop wrapper around tegra_update_cpu_speed()
  cpufreq: imx6q: Remove unused include
  cpufreq: imx6q: Drop devm_clk/regulator_get usage
  cpufreq: powernow-k8: Suppress checkpatch warnings
  cpufreq: powernv: make local function static
  cpufreq: Enable big.LITTLE cpufreq driver on arm64
  cpufreq: nforce2: remove DEFINE_PCI_DEVICE_TABLE macro
  intel_pstate: Add CPU IDs for Broadwell processors
  cpufreq: Fix build error on some platforms that use cpufreq_for_each_*
  PM / OPP: Move cpufreq specific OPP functions out of generic OPP library
  PM / OPP: Remove cpufreq wrapper dependency on internal data organization
  cpufreq: Catch double invocations of cpufreq_freq_transition_begin/end
  intel_pstate: Remove sample parameter in intel_pstate_calc_busy
  cpufreq: Kconfig: Fix spelling errors
  cpufreq: Make linux-pm@vger.kernel.org official mailing list
  cpufreq: exynos: Use dev_err/info function instead of pr_err/info
  ...

2 files changed, 10 insertions, 16 deletions

diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 85399c98f84a..45ce065e7170 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -1092,20 +1092,21 @@ int da850_register_cpufreq(char *async_clk)
 
 static int da850_round_armrate(struct clk *clk, unsigned long rate)
 {
-        int i, ret = 0, diff;
+        int ret = 0, diff;
         unsigned int best = (unsigned int) -1;
         struct cpufreq_frequency_table *table = cpufreq_info.freq_table;
+        struct cpufreq_frequency_table *pos;
 
         rate /= 1000; /* convert to kHz */
 
-        for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {
-                diff = table[i].frequency - rate;
+        cpufreq_for_each_entry(pos, table) {
+                diff = pos->frequency - rate;
                 if (diff < 0)
                         diff = -diff;
 
                 if (diff < best) {
                         best = diff;
-                        ret = table[i].frequency;
+                        ret = pos->frequency;
                 }
         }
 
diff --git a/arch/mips/loongson/lemote-2f/clock.c b/arch/mips/loongson/lemote-2f/clock.c
index 67dd94ef28e6..1eed38e28b1e 100644
--- a/arch/mips/loongson/lemote-2f/clock.c
+++ b/arch/mips/loongson/lemote-2f/clock.c
@@ -91,10 +91,9 @@ EXPORT_SYMBOL(clk_put);
 
 int clk_set_rate(struct clk *clk, unsigned long rate)
 {
-        unsigned int rate_khz = rate / 1000;
+        struct cpufreq_frequency_table *pos;
         int ret = 0;
         int regval;
-        int i;
 
         if (likely(clk->ops && clk->ops->set_rate)) {
                 unsigned long flags;
@@ -107,22 +106,16 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
         if (unlikely(clk->flags & CLK_RATE_PROPAGATES))
                 propagate_rate(clk);
 
-        for (i = 0; loongson2_clockmod_table[i].frequency != CPUFREQ_TABLE_END;
-             i++) {
-                if (loongson2_clockmod_table[i].frequency ==
-                    CPUFREQ_ENTRY_INVALID)
-                        continue;
-                if (rate_khz == loongson2_clockmod_table[i].frequency)
+        cpufreq_for_each_valid_entry(pos, loongson2_clockmod_table)
+                if (rate == pos->frequency)
                         break;
-        }
-        if (rate_khz != loongson2_clockmod_table[i].frequency)
+        if (rate != pos->frequency)
                 return -ENOTSUPP;
 
         clk->rate = rate;
 
         regval = LOONGSON_CHIPCFG0;
-        regval = (regval & ~0x7) |
-                (loongson2_clockmod_table[i].driver_data - 1);
+        regval = (regval & ~0x7) | (pos->driver_data - 1);
         LOONGSON_CHIPCFG0 = regval;
 
         return ret;