Commit d0b3847b authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown

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: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent eb775d38
...@@ -667,8 +667,6 @@ struct twl4030_codec_data { ...@@ -667,8 +667,6 @@ struct twl4030_codec_data {
unsigned int check_defaults:1; unsigned int check_defaults:1;
unsigned int reset_registers:1; unsigned int reset_registers:1;
unsigned int hs_extmute:1; unsigned int hs_extmute:1;
void (*set_hs_extmute)(int mute); /* Deprecated, use hs_extmute_gpio and
hs_extmute_disable_level */
int hs_extmute_gpio; int hs_extmute_gpio;
}; };
......
...@@ -767,9 +767,6 @@ static void headset_ramp(struct snd_soc_codec *codec, int ramp) ...@@ -767,9 +767,6 @@ static void headset_ramp(struct snd_soc_codec *codec, int ramp)
if (pdata && pdata->hs_extmute) { if (pdata && pdata->hs_extmute) {
if (gpio_is_valid(pdata->hs_extmute_gpio)) { if (gpio_is_valid(pdata->hs_extmute_gpio)) {
gpio_set_value(pdata->hs_extmute_gpio, 1); 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 { } else {
hs_pop |= TWL4030_EXTMUTE; hs_pop |= TWL4030_EXTMUTE;
twl4030_write(codec, TWL4030_REG_HS_POPN_SET, hs_pop); 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) ...@@ -808,9 +805,6 @@ static void headset_ramp(struct snd_soc_codec *codec, int ramp)
if (pdata && pdata->hs_extmute) { if (pdata && pdata->hs_extmute) {
if (gpio_is_valid(pdata->hs_extmute_gpio)) { if (gpio_is_valid(pdata->hs_extmute_gpio)) {
gpio_set_value(pdata->hs_extmute_gpio, 0); 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 { } else {
hs_pop &= ~TWL4030_EXTMUTE; hs_pop &= ~TWL4030_EXTMUTE;
twl4030_write(codec, TWL4030_REG_HS_POPN_SET, hs_pop); twl4030_write(codec, TWL4030_REG_HS_POPN_SET, hs_pop);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment