Merge branch 'pm-cpufreq'
* pm-cpufreq: cpufreq: exynos: Remove unwanted EXPORT_SYMBOL cpufreq: tegra: don't error target() when suspended
This commit is contained in:
commit
db8fbb49df
4 changed files with 1 additions and 6 deletions
|
@ -157,4 +157,3 @@ int exynos4210_cpufreq_init(struct exynos_dvfs_info *info)
|
||||||
pr_debug("%s: failed initialization\n", __func__);
|
pr_debug("%s: failed initialization\n", __func__);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(exynos4210_cpufreq_init);
|
|
||||||
|
|
|
@ -211,4 +211,3 @@ int exynos4x12_cpufreq_init(struct exynos_dvfs_info *info)
|
||||||
pr_debug("%s: failed initialization\n", __func__);
|
pr_debug("%s: failed initialization\n", __func__);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(exynos4x12_cpufreq_init);
|
|
||||||
|
|
|
@ -236,4 +236,3 @@ int exynos5250_cpufreq_init(struct exynos_dvfs_info *info)
|
||||||
pr_err("%s: failed initialization\n", __func__);
|
pr_err("%s: failed initialization\n", __func__);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(exynos5250_cpufreq_init);
|
|
||||||
|
|
|
@ -142,10 +142,8 @@ static int tegra_target(struct cpufreq_policy *policy, unsigned int index)
|
||||||
|
|
||||||
mutex_lock(&tegra_cpu_lock);
|
mutex_lock(&tegra_cpu_lock);
|
||||||
|
|
||||||
if (is_suspended) {
|
if (is_suspended)
|
||||||
ret = -EBUSY;
|
|
||||||
goto out;
|
goto out;
|
||||||
}
|
|
||||||
|
|
||||||
freq = freq_table[index].frequency;
|
freq = freq_table[index].frequency;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue