summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-09-10 13:46:29 +0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-22 11:18:26 -0400
commitd0b3847b40f8da4b90b22db0f3678ba68bcd1b4e (patch)
treea648b417091d2b0a17cc915fdd7f261e5832def6 /sound
parenteb775d38e0ff4a83d7fd020a7b147bb61b1e4006 (diff)
downloadlinux-stable-d0b3847b40f8da4b90b22db0f3678ba68bcd1b4e.tar.gz
linux-stable-d0b3847b40f8da4b90b22db0f3678ba68bcd1b4e.tar.bz2
linux-stable-d0b3847b40f8da4b90b22db0f3678ba68bcd1b4e.zip
ASoC/mfd: twl4030: Remove set_hs_extmute callback from platform data
We no longer have users for the set_hs_extmute callback which has been replaced by hs_extmute_gpio so the codec driver can handle the external mute if it is needed by the board. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Acked-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/twl4030.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 0c83c9263f4f..aa96788c8673 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -767,9 +767,6 @@ static void headset_ramp(struct snd_soc_codec *codec, int ramp)
if (pdata && pdata->hs_extmute) {
if (gpio_is_valid(pdata->hs_extmute_gpio)) {
gpio_set_value(pdata->hs_extmute_gpio, 1);
- } else if (pdata->set_hs_extmute) {
- dev_warn(codec->dev, "set_hs_extmute is deprecated\n");
- pdata->set_hs_extmute(1);
} else {
hs_pop |= TWL4030_EXTMUTE;
twl4030_write(codec, TWL4030_REG_HS_POPN_SET, hs_pop);
@@ -808,9 +805,6 @@ static void headset_ramp(struct snd_soc_codec *codec, int ramp)
if (pdata && pdata->hs_extmute) {
if (gpio_is_valid(pdata->hs_extmute_gpio)) {
gpio_set_value(pdata->hs_extmute_gpio, 0);
- } else if (pdata->set_hs_extmute) {
- dev_warn(codec->dev, "set_hs_extmute is deprecated\n");
- pdata->set_hs_extmute(0);
} else {
hs_pop &= ~TWL4030_EXTMUTE;
twl4030_write(codec, TWL4030_REG_HS_POPN_SET, hs_pop);