Merge tag 'mfd-for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[linux-2.6-microblaze.git] / drivers / cpufreq / s3c24xx-cpufreq.c

diff --git a/drivers/cpufreq/s3c24xx-cpufreq.c b/drivers/cpufreq/s3c24xx-cpufreq.c
index 2506974..a3dc192 100644 (file)
--- a/drivers/cpufreq/s3c24xx-cpufreq.c
+++ b/drivers/cpufreq/s3c24xx-cpufreq.c
@@ -217,7 +217,7 @@ static int s3c_cpufreq_settarget(struct cpufreq_policy *policy,
        s3c_cpufreq_updateclk(clk_pclk, cpu_new.freq.pclk);
 
        /* start the frequency change */
-       cpufreq_notify_transition(policy, &freqs.freqs, CPUFREQ_PRECHANGE);
+       cpufreq_freq_transition_begin(policy, &freqs.freqs);
 
        /* If hclk is staying the same, then we do not need to
         * re-write the IO or the refresh timings whilst we are changing
@@ -261,7 +261,7 @@ static int s3c_cpufreq_settarget(struct cpufreq_policy *policy,
        local_irq_restore(flags);
 
        /* notify everyone we've done this */
-       cpufreq_notify_transition(policy, &freqs.freqs, CPUFREQ_POSTCHANGE);
+       cpufreq_freq_transition_end(policy, &freqs.freqs, 0);
 
        s3c_freq_dbg("%s: finished\n", __func__);
        return 0;