Commit 7f9558e1 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

Merge back earlier cpufreq material for 4.20.

parents d51aea13 d1e13031
...@@ -58,6 +58,7 @@ static const struct of_device_id whitelist[] __initconst = { ...@@ -58,6 +58,7 @@ static const struct of_device_id whitelist[] __initconst = {
{ .compatible = "renesas,r8a73a4", }, { .compatible = "renesas,r8a73a4", },
{ .compatible = "renesas,r8a7740", }, { .compatible = "renesas,r8a7740", },
{ .compatible = "renesas,r8a7743", }, { .compatible = "renesas,r8a7743", },
{ .compatible = "renesas,r8a7744", },
{ .compatible = "renesas,r8a7745", }, { .compatible = "renesas,r8a7745", },
{ .compatible = "renesas,r8a7778", }, { .compatible = "renesas,r8a7778", },
{ .compatible = "renesas,r8a7779", }, { .compatible = "renesas,r8a7779", },
......
...@@ -403,7 +403,7 @@ EXPORT_SYMBOL_GPL(cpufreq_freq_transition_begin); ...@@ -403,7 +403,7 @@ EXPORT_SYMBOL_GPL(cpufreq_freq_transition_begin);
void cpufreq_freq_transition_end(struct cpufreq_policy *policy, void cpufreq_freq_transition_end(struct cpufreq_policy *policy,
struct cpufreq_freqs *freqs, int transition_failed) struct cpufreq_freqs *freqs, int transition_failed)
{ {
if (unlikely(WARN_ON(!policy->transition_ongoing))) if (WARN_ON(!policy->transition_ongoing))
return; return;
cpufreq_notify_post_transition(policy, freqs, transition_failed); cpufreq_notify_post_transition(policy, freqs, transition_failed);
......
...@@ -611,8 +611,8 @@ static int s5pv210_cpufreq_probe(struct platform_device *pdev) ...@@ -611,8 +611,8 @@ static int s5pv210_cpufreq_probe(struct platform_device *pdev)
for_each_compatible_node(np, NULL, "samsung,s5pv210-dmc") { for_each_compatible_node(np, NULL, "samsung,s5pv210-dmc") {
id = of_alias_get_id(np, "dmc"); id = of_alias_get_id(np, "dmc");
if (id < 0 || id >= ARRAY_SIZE(dmc_base)) { if (id < 0 || id >= ARRAY_SIZE(dmc_base)) {
pr_err("%s: failed to get alias of dmc node '%s'\n", pr_err("%s: failed to get alias of dmc node '%pOFn'\n",
__func__, np->name); __func__, np);
of_node_put(np); of_node_put(np);
return id; return id;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment