Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db8fbb49 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpufreq' 

* pm-cpufreq:
  cpufreq: exynos: Remove unwanted EXPORT_SYMBOL
  cpufreq: tegra: don't error target() when suspended
parents 2d304ba7 3d3c6f54

drivers/cpufreq/exynos4210-cpufreq.c

+0 −1
Original line number Diff line number Diff line
@@ -157,4 +157,3 @@ int exynos4210_cpufreq_init(struct exynos_dvfs_info *info) 
	pr_debug("%s: failed initialization\n", __func__);

	return -EINVAL;

}
 
EXPORT_SYMBOL(exynos4210_cpufreq_init);

drivers/cpufreq/exynos4x12-cpufreq.c

+0 −1
Original line number Diff line number Diff line
@@ -211,4 +211,3 @@ int exynos4x12_cpufreq_init(struct exynos_dvfs_info *info) 
	pr_debug("%s: failed initialization\n", __func__);

	return -EINVAL;

}
 
EXPORT_SYMBOL(exynos4x12_cpufreq_init);

drivers/cpufreq/exynos5250-cpufreq.c

+0 −1
Original line number Diff line number Diff line
@@ -236,4 +236,3 @@ int exynos5250_cpufreq_init(struct exynos_dvfs_info *info) 
	pr_err("%s: failed initialization\n", __func__);

	return -EINVAL;

}
 
EXPORT_SYMBOL(exynos5250_cpufreq_init);

drivers/cpufreq/tegra-cpufreq.c

+1 −3
Original line number Diff line number Diff line
@@ -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;