Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[karo-tx-linux.git] / drivers / cpufreq / pcc-cpufreq.c

diff --git a/drivers/cpufreq/pcc-cpufreq.c b/drivers/cpufreq/pcc-cpufreq.c
index e2b4f40ff69acaaff51f6461caafd4c8a23bdd16..728a2d8794993defdbe1e10c15fe7ee814c528bb 100644 (file)
--- a/drivers/cpufreq/pcc-cpufreq.c
+++ b/drivers/cpufreq/pcc-cpufreq.c
@@ -213,8 +213,9 @@ static int pcc_cpufreq_target(struct cpufreq_policy *policy,
                cpu, target_freq,
                (pcch_virt_addr + pcc_cpu_data->input_offset));
 
+       freqs.old = policy->cur;
        freqs.new = target_freq;
-       cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
+       cpufreq_freq_transition_begin(policy, &freqs);
 
        input_buffer = 0x1 | (((target_freq * 100)
                               / (ioread32(&pcch_hdr->nominal) * 1000)) << 8);
@@ -228,25 +229,20 @@ static int pcc_cpufreq_target(struct cpufreq_policy *policy,
        memset_io((pcch_virt_addr + pcc_cpu_data->input_offset), 0, BUF_SZ);
 
        status = ioread16(&pcch_hdr->status);
+       iowrite16(0, &pcch_hdr->status);
+
+       cpufreq_freq_transition_end(policy, &freqs, status != CMD_COMPLETE);
+       spin_unlock(&pcc_lock);
+
        if (status != CMD_COMPLETE) {
                pr_debug("target: FAILED for cpu %d, with status: 0x%x\n",
                        cpu, status);
-               goto cmd_incomplete;
+               return -EINVAL;
        }
-       iowrite16(0, &pcch_hdr->status);
 
-       cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
        pr_debug("target: was SUCCESSFUL for cpu %d\n", cpu);
-       spin_unlock(&pcc_lock);
 
        return 0;
-
-cmd_incomplete:
-       freqs.new = freqs.old;
-       cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
-       iowrite16(0, &pcch_hdr->status);
-       spin_unlock(&pcc_lock);
-       return -EINVAL;
 }
 
 static int pcc_get_offset(int cpu)