Permalink
Browse files

kernel: power: allow removing of DVFS_LOCK_ID_USER and setting max fr…

…eq limit only
  • Loading branch information...
gokhanmoral committed Dec 21, 2012
1 parent 674ed33 commit 701f18bf6d0369537c06f5783b581d0291ac555b
Showing with 10 additions and 10 deletions.
  1. +7 −7 kernel/power/main.c
  2. +3 −3 sound/soc/codecs/wm8994.c
View
@@ -453,7 +453,7 @@ static ssize_t cpufreq_max_limit_store(struct kobject *kobj,
if (val == -1) { /* Unlock request */
if (cpufreq_max_limit_val != -1) {
-// exynos_cpufreq_upper_limit_free(DVFS_LOCK_ID_USER);
+ exynos_cpufreq_upper_limit_free(DVFS_LOCK_ID_USER);
cpufreq_max_limit_val = -1;
} else /* Already unlocked */
printk(KERN_ERR "%s: Unlock request is ignored\n",
@@ -464,12 +464,12 @@ static ssize_t cpufreq_max_limit_store(struct kobject *kobj,
if (get_cpufreq_level((unsigned int)val, &cpufreq_level)
== VALID_LEVEL) {
-// if (cpufreq_max_limit_val != -1)
+ if (cpufreq_max_limit_val != -1)
/* Unlock the previous lock */
-// exynos_cpufreq_upper_limit_free(
-// DVFS_LOCK_ID_USER);
-// lock_ret = exynos_cpufreq_upper_limit(
-// DVFS_LOCK_ID_USER, cpufreq_level);
+ exynos_cpufreq_upper_limit_free(
+ DVFS_LOCK_ID_USER);
+ lock_ret = exynos_cpufreq_upper_limit(
+ DVFS_LOCK_ID_USER, cpufreq_level);
/* ret of exynos_cpufreq_upper_limit is meaningless.
0 is fail? success? */
cpufreq_max_limit_val = val;
@@ -510,7 +510,7 @@ static ssize_t cpufreq_min_limit_store(struct kobject *kobj,
if (val == -1) { /* Unlock request */
if (cpufreq_min_limit_val != -1) {
-// exynos_cpufreq_lock_free(DVFS_LOCK_ID_USER);
+ exynos_cpufreq_lock_free(DVFS_LOCK_ID_USER);
cpufreq_min_limit_val = -1;
} else /* Already unlocked */
printk(KERN_ERR "%s: Unlock request is ignored\n",
@@ -193,7 +193,7 @@ static int wm8994_volatile(struct snd_soc_codec *codec, unsigned int reg)
}
}
-#if defined(CONFIG_SND_VOODOO) && !defined(CONFIG_SND_VOODOO_MODULE)
+#ifdef CONFIG_SND_VOODOO
#include "wm8994_voodoo.h"
#endif
@@ -204,7 +204,7 @@ static int wm8994_write(struct snd_soc_codec *codec, unsigned int reg,
BUG_ON(reg > WM8994_MAX_REGISTER);
-#if defined(CONFIG_SND_VOODOO) && !defined(CONFIG_SND_VOODOO_MODULE)
+#ifdef CONFIG_SND_VOODOO
value = voodoo_hook_wm8994_write(codec, reg, value);
#endif
if (!wm8994_volatile(codec, reg)) {
@@ -4227,7 +4227,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
ARRAY_SIZE(wm8958_intercon));
break;
}
-#if defined(CONFIG_SND_VOODOO) && !defined(CONFIG_SND_VOODOO_MODULE)
+#ifdef CONFIG_SND_VOODOO
voodoo_hook_wm8994_pcm_probe(codec);
#endif

0 comments on commit 701f18b

Please sign in to comment.