ASoC: twl6040: Use neutral name for power mode text/enum
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Mon, 27 Jun 2011 10:33:14 +0000 (13:33 +0300)
committerPeter Ujfalusi <peter.ujfalusi@ti.com>
Thu, 7 Jul 2011 11:23:43 +0000 (14:23 +0300)
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>
sound/soc/codecs/twl6040.c

index 14e3a58d1af5bfbc4bbbaf4642069e135f88d77a..8f923e5c9e48a962dca44c268ab186d72091cf5e 100644 (file)
@@ -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),
 };