ASoC: codecs: tas*: merge .digital_mute() into .mute_stream()
[sfrench/cifs-2.6.git] / sound / soc / codecs / tas2552.c
index 529c0fb93f9b2de4a13d61ffefda01158e13e55e..e23905e3f2407ffcd03f7e71f5c7f483c6436cf3 100644 (file)
@@ -407,7 +407,7 @@ static int tas2552_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
                        clk_id = TAS2552_PLL_CLKIN_BCLK;
                        freq = 0;
                }
-               /* fall through */
+               fallthrough;
        case TAS2552_PLL_CLKIN_BCLK:
        case TAS2552_PLL_CLKIN_1_8_FIXED:
                mask = TAS2552_PLL_SRC_MASK;
@@ -465,7 +465,7 @@ static int tas2552_set_dai_tdm_slot(struct snd_soc_dai *dai,
        return 0;
 }
 
-static int tas2552_mute(struct snd_soc_dai *dai, int mute)
+static int tas2552_mute(struct snd_soc_dai *dai, int mute, int direction)
 {
        u8 cfg1_reg = 0;
        struct snd_soc_component *component = dai->component;
@@ -519,7 +519,8 @@ static const struct snd_soc_dai_ops tas2552_speaker_dai_ops = {
        .set_sysclk     = tas2552_set_dai_sysclk,
        .set_fmt        = tas2552_set_dai_fmt,
        .set_tdm_slot   = tas2552_set_dai_tdm_slot,
-       .digital_mute = tas2552_mute,
+       .mute_stream    = tas2552_mute,
+       .no_capture_mute = 1,
 };
 
 /* Formats supported by TAS2552 driver. */