diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-27 04:03:43 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-27 04:03:43 +0400 |
| commit | db8fbb49df8ae4da155d3b7abf39e79b41f72746 (patch) | |
| tree | c7db70241a15499496d53921d2cc6eedd2d293c0 /drivers/cpufreq | |
| parent | 2d304ba757eb79f58451538497b4f556555e3eb7 (diff) | |
| parent | 3d3c6f54bccf0a621682d17e25cf22895a0c6e5a (diff) | |
| download | linux-db8fbb49df8ae4da155d3b7abf39e79b41f72746.tar.xz | |
Merge branch 'pm-cpufreq'
* pm-cpufreq:
cpufreq: exynos: Remove unwanted EXPORT_SYMBOL
cpufreq: tegra: don't error target() when suspended
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/exynos4210-cpufreq.c | 1 | ||||
| -rw-r--r-- | drivers/cpufreq/exynos4x12-cpufreq.c | 1 | ||||
| -rw-r--r-- | drivers/cpufreq/exynos5250-cpufreq.c | 1 | ||||
| -rw-r--r-- | drivers/cpufreq/tegra-cpufreq.c | 4 |
4 files changed, 1 insertions, 6 deletions
diff --git a/drivers/cpufreq/exynos4210-cpufreq.c b/drivers/cpufreq/exynos4210-cpufreq.c index f2c75065ce19..dfd1643b0b2f 100644 --- a/drivers/cpufreq/exynos4210-cpufreq.c +++ b/drivers/cpufreq/exynos4210-cpufreq.c @@ -157,4 +157,3 @@ err_moutcore: pr_debug("%s: failed initialization\n", __func__); return -EINVAL; } -EXPORT_SYMBOL(exynos4210_cpufreq_init); diff --git a/drivers/cpufreq/exynos4x12-cpufreq.c b/drivers/cpufreq/exynos4x12-cpufreq.c index 8683304ce62c..efad5e657f6f 100644 --- a/drivers/cpufreq/exynos4x12-cpufreq.c +++ b/drivers/cpufreq/exynos4x12-cpufreq.c @@ -211,4 +211,3 @@ err_moutcore: pr_debug("%s: failed initialization\n", __func__); return -EINVAL; } -EXPORT_SYMBOL(exynos4x12_cpufreq_init); diff --git a/drivers/cpufreq/exynos5250-cpufreq.c b/drivers/cpufreq/exynos5250-cpufreq.c index 9fae466d7746..8feda86fe42c 100644 --- a/drivers/cpufreq/exynos5250-cpufreq.c +++ b/drivers/cpufreq/exynos5250-cpufreq.c @@ -236,4 +236,3 @@ err_moutcore: pr_err("%s: failed initialization\n", __func__); return -EINVAL; } -EXPORT_SYMBOL(exynos5250_cpufreq_init); diff --git a/drivers/cpufreq/tegra-cpufreq.c b/drivers/cpufreq/tegra-cpufreq.c index f42df7ec03c5..b7309c37033d 100644 --- a/drivers/cpufreq/tegra-cpufreq.c +++ b/drivers/cpufreq/tegra-cpufreq.c @@ -142,10 +142,8 @@ static int tegra_target(struct cpufreq_policy *policy, unsigned int index) mutex_lock(&tegra_cpu_lock); - if (is_suspended) { - ret = -EBUSY; + if (is_suspended) goto out; - } freq = freq_table[index].frequency; |