diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2011-06-27 06:33:14 -0400 |
---|---|---|
committer | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2011-07-07 07:23:43 -0400 |
commit | 7cca606794ceb597e95fd0a0f3a8dcdd51af55e0 (patch) | |
tree | 304bf8ea5c5c48b9207f5ecf659c982ee5d62745 /sound/soc | |
parent | 1b7c4725e2e926eaeb8657ac22992ec27fe03135 (diff) |
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.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index 14e3a58d1af5..8f923e5c9e48 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 = | |||
1013 | SOC_DAPM_SINGLE("Switch", TWL6040_REG_EARCTL, 0, 1, 0); | 1013 | SOC_DAPM_SINGLE("Switch", TWL6040_REG_EARCTL, 0, 1, 0); |
1014 | 1014 | ||
1015 | /* Headset power mode */ | 1015 | /* Headset power mode */ |
1016 | static const char *twl6040_headset_power_texts[] = { | 1016 | static const char *twl6040_power_mode_texts[] = { |
1017 | "Low-Power", "High-Perfomance", | 1017 | "Low-Power", "High-Perfomance", |
1018 | }; | 1018 | }; |
1019 | 1019 | ||
1020 | static const struct soc_enum twl6040_headset_power_enum = | 1020 | static const struct soc_enum twl6040_power_mode_enum = |
1021 | SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(twl6040_headset_power_texts), | 1021 | SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(twl6040_power_mode_texts), |
1022 | twl6040_headset_power_texts); | 1022 | twl6040_power_mode_texts); |
1023 | 1023 | ||
1024 | static int twl6040_headset_power_get_enum(struct snd_kcontrol *kcontrol, | 1024 | static int twl6040_headset_power_get_enum(struct snd_kcontrol *kcontrol, |
1025 | struct snd_ctl_elem_value *ucontrol) | 1025 | struct snd_ctl_elem_value *ucontrol) |
@@ -1068,7 +1068,7 @@ static const struct snd_kcontrol_new twl6040_snd_controls[] = { | |||
1068 | SOC_SINGLE_TLV("Earphone Playback Volume", | 1068 | SOC_SINGLE_TLV("Earphone Playback Volume", |
1069 | TWL6040_REG_EARCTL, 1, 0xF, 1, ep_tlv), | 1069 | TWL6040_REG_EARCTL, 1, 0xF, 1, ep_tlv), |
1070 | 1070 | ||
1071 | SOC_ENUM_EXT("Headset Power Mode", twl6040_headset_power_enum, | 1071 | SOC_ENUM_EXT("Headset Power Mode", twl6040_power_mode_enum, |
1072 | twl6040_headset_power_get_enum, | 1072 | twl6040_headset_power_get_enum, |
1073 | twl6040_headset_power_put_enum), | 1073 | twl6040_headset_power_put_enum), |
1074 | }; | 1074 | }; |