projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.10.64' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
cpufreq
/
s3c64xx-cpufreq.c
diff --git
a/drivers/cpufreq/s3c64xx-cpufreq.c
b/drivers/cpufreq/s3c64xx-cpufreq.c
index 6f9490b3c356278e7ec22f6027250a403ef42eca..27cacb524796994f2cc06a5bef1478aa8e4b9e06 100644
(file)
--- a/
drivers/cpufreq/s3c64xx-cpufreq.c
+++ b/
drivers/cpufreq/s3c64xx-cpufreq.c
@@
-84,7
+84,6
@@
static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,
if (ret != 0)
return ret;
if (ret != 0)
return ret;
- freqs.cpu = 0;
freqs.old = clk_get_rate(armclk) / 1000;
freqs.new = s3c64xx_freq_table[i].frequency;
freqs.flags = 0;
freqs.old = clk_get_rate(armclk) / 1000;
freqs.new = s3c64xx_freq_table[i].frequency;
freqs.flags = 0;
@@
-95,7
+94,7
@@
static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,
pr_debug("Transition %d-%dkHz\n", freqs.old, freqs.new);
pr_debug("Transition %d-%dkHz\n", freqs.old, freqs.new);
- cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+ cpufreq_notify_transition(
policy,
&freqs, CPUFREQ_PRECHANGE);
#ifdef CONFIG_REGULATOR
if (vddarm && freqs.new > freqs.old) {
#ifdef CONFIG_REGULATOR
if (vddarm && freqs.new > freqs.old) {
@@
-117,7
+116,7
@@
static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,
goto err;
}
goto err;
}
- cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+ cpufreq_notify_transition(
policy,
&freqs, CPUFREQ_POSTCHANGE);
#ifdef CONFIG_REGULATOR
if (vddarm && freqs.new < freqs.old) {
#ifdef CONFIG_REGULATOR
if (vddarm && freqs.new < freqs.old) {
@@
-141,7
+140,7
@@
err_clk:
if (clk_set_rate(armclk, freqs.old * 1000) < 0)
pr_err("Failed to restore original clock rate\n");
err:
if (clk_set_rate(armclk, freqs.old * 1000) < 0)
pr_err("Failed to restore original clock rate\n");
err:
- cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+ cpufreq_notify_transition(
policy,
&freqs, CPUFREQ_POSTCHANGE);
return ret;
}
return ret;
}