Merge branch 'fix/dw' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-dw

Conflicts:
	drivers/spi/spi-dw-mid.c

4 files changed, 10 insertions, 11 deletions

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index d9fdeddcef96..6e93e7f98358 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1289,6 +1289,8 @@ err_get_freq:
                 per_cpu(cpufreq_cpu_data, j) = NULL;
         write_unlock_irqrestore(&cpufreq_driver_lock, flags);
 
+        up_write(&policy->rwsem);
+
         if (cpufreq_driver->exit)
                 cpufreq_driver->exit(policy);
 err_set_policy_cpu:
@@ -1656,6 +1658,8 @@ void cpufreq_suspend(void)
         if (!cpufreq_driver)
                 return;
 
+        cpufreq_suspended = true;
+
         if (!has_target())
                 return;
 
@@ -1670,8 +1674,6 @@ void cpufreq_suspend(void)
                         pr_err("%s: Failed to suspend driver: %p\n", __func__,
                                 policy);
         }
-
-        cpufreq_suspended = true;
 }
 
 /**
@@ -1687,13 +1689,13 @@ void cpufreq_resume(void)
         if (!cpufreq_driver)
                 return;
 
+        cpufreq_suspended = false;
+
         if (!has_target())
                 return;
 
         pr_debug("%s: Resuming Governors\n", __func__);
 
-        cpufreq_suspended = false;
-
         list_for_each_entry(policy, &cpufreq_policy_list, policy_list) {
                 if (cpufreq_driver->resume && cpufreq_driver->resume(policy))
                         pr_err("%s: Failed to resume driver: %p\n", __func__,
diff --git a/drivers/cpufreq/cpufreq_opp.c b/drivers/cpufreq/cpufreq_opp.c
index f7a32d2326c6..773bcde893c0 100644
--- a/drivers/cpufreq/cpufreq_opp.c
+++ b/drivers/cpufreq/cpufreq_opp.c
@@ -60,7 +60,7 @@ int dev_pm_opp_init_cpufreq_table(struct device *dev,
                 goto out;
         }
 
-        freq_table = kcalloc(sizeof(*freq_table), (max_opps + 1), GFP_ATOMIC);
+        freq_table = kcalloc((max_opps + 1), sizeof(*freq_table), GFP_ATOMIC);
         if (!freq_table) {
                 ret = -ENOMEM;
                 goto out;
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index c5eac949760d..0668b389c516 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -660,6 +660,7 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {
         ICPU(0x3f, core_params),
         ICPU(0x45, core_params),
         ICPU(0x46, core_params),
+        ICPU(0x4c, byt_params),
         ICPU(0x4f, core_params),
         ICPU(0x56, core_params),
         {}
@@ -688,7 +689,7 @@ static int intel_pstate_init_cpu(unsigned int cpunum)
 
         add_timer_on(&cpu->timer, cpunum);
 
-        pr_info("Intel pstate controlling: cpu %d\n", cpunum);
+        pr_debug("Intel pstate controlling: cpu %d\n", cpunum);
 
         return 0;
 }
@@ -707,10 +708,6 @@ static unsigned int intel_pstate_get(unsigned int cpu_num)
 
 static int intel_pstate_set_policy(struct cpufreq_policy *policy)
 {
-        struct cpudata *cpu;
-
-        cpu = all_cpu_data[policy->cpu];
-
         if (!policy->cpuinfo.max_freq)
                 return -ENODEV;
 
diff --git a/drivers/cpufreq/s5pv210-cpufreq.c b/drivers/cpufreq/s5pv210-cpufreq.c
index 9a68225a757e..3f9791f07b8e 100644
--- a/drivers/cpufreq/s5pv210-cpufreq.c
+++ b/drivers/cpufreq/s5pv210-cpufreq.c
@@ -501,7 +501,7 @@ static int check_mem_type(void __iomem *dmc_reg)
         return val >> 8;
 }
 
-static int __init s5pv210_cpu_init(struct cpufreq_policy *policy)
+static int s5pv210_cpu_init(struct cpufreq_policy *policy)
 {
         unsigned long mem_type;
         int ret;