ASoC: codecs: tas*: merge .digital_mute() into .mute_stream()

[sfrench/cifs-2.6.git] / sound / soc / codecs / tas6424.c

diff --git a/sound/soc/codecs/tas6424.c b/sound/soc/codecs/tas6424.c
index 36aebdb8f55c5b9540f421235f0c37ef815fd213..6198138e693ac9b955589896127eca8ef5f66dcf 100644 (file)
--- a/sound/soc/codecs/tas6424.c
+++ b/sound/soc/codecs/tas6424.c
@@ -252,7 +252,7 @@ static int tas6424_set_dai_tdm_slot(struct snd_soc_dai *dai,
        return 0;
 }
 
-static int tas6424_mute(struct snd_soc_dai *dai, int mute)
+static int tas6424_mute(struct snd_soc_dai *dai, int mute, int direction)
 {
        struct snd_soc_component *component = dai->component;
        struct tas6424_data *tas6424 = snd_soc_component_get_drvdata(component);
@@ -378,11 +378,12 @@ static struct snd_soc_component_driver soc_codec_dev_tas6424 = {
        .non_legacy_dai_naming  = 1,
 };
 
-static struct snd_soc_dai_ops tas6424_speaker_dai_ops = {
+static const struct snd_soc_dai_ops tas6424_speaker_dai_ops = {
        .hw_params      = tas6424_hw_params,
        .set_fmt        = tas6424_set_dai_fmt,
        .set_tdm_slot   = tas6424_set_dai_tdm_slot,
-       .digital_mute   = tas6424_mute,
+       .mute_stream    = tas6424_mute,
+       .no_capture_mute = 1,
 };
 
 static struct snd_soc_dai_driver tas6424_dai[] = {