aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2011-06-27 13:33:14 +0300
committerPeter Ujfalusi <peter.ujfalusi@ti.com>2011-07-07 14:23:43 +0300
commit7cca606794ceb597e95fd0a0f3a8dcdd51af55e0 (patch)
tree304bf8ea5c5c48b9207f5ecf659c982ee5d62745 /sound/soc
parent1b7c4725e2e926eaeb8657ac22992ec27fe03135 (diff)
downloadkernel_goldelico_gta04-7cca606794ceb597e95fd0a0f3a8dcdd51af55e0.zip
kernel_goldelico_gta04-7cca606794ceb597e95fd0a0f3a8dcdd51af55e0.tar.gz
kernel_goldelico_gta04-7cca606794ceb597e95fd0a0f3a8dcdd51af55e0.tar.bz2
ASoC: twl6040: Use neutral name for power mode text/enum
Change the variable names to be neutral (not refering to HS). This will ease up the introduction of PLL selection, which going to use the same enum strings. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/twl6040.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index 14e3a58..8f923e5 100644
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -1013,13 +1013,13 @@ static const struct snd_kcontrol_new ep_driver_switch_controls =
SOC_DAPM_SINGLE("Switch", TWL6040_REG_EARCTL, 0, 1, 0);
/* Headset power mode */
-static const char *twl6040_headset_power_texts[] = {
+static const char *twl6040_power_mode_texts[] = {
"Low-Power", "High-Perfomance",
};
-static const struct soc_enum twl6040_headset_power_enum =
- SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(twl6040_headset_power_texts),
- twl6040_headset_power_texts);
+static const struct soc_enum twl6040_power_mode_enum =
+ SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(twl6040_power_mode_texts),
+ twl6040_power_mode_texts);
static int twl6040_headset_power_get_enum(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
@@ -1068,7 +1068,7 @@ static const struct snd_kcontrol_new twl6040_snd_controls[] = {
SOC_SINGLE_TLV("Earphone Playback Volume",
TWL6040_REG_EARCTL, 1, 0xF, 1, ep_tlv),
- SOC_ENUM_EXT("Headset Power Mode", twl6040_headset_power_enum,
+ SOC_ENUM_EXT("Headset Power Mode", twl6040_power_mode_enum,
twl6040_headset_power_get_enum,
twl6040_headset_power_put_enum),
};