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

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

diff --git a/sound/soc/codecs/tas2552.c b/sound/soc/codecs/tas2552.c
index d90e5f2b6f27bc9b7cf08b2923b0ec3caf24cc82..e23905e3f2407ffcd03f7e71f5c7f483c6436cf3 100644 (file)
--- a/sound/soc/codecs/tas2552.c
+++ b/sound/soc/codecs/tas2552.c
@@ -169,7 +169,7 @@ static int tas2552_setup_pll(struct snd_soc_component *component,
                pll_clkin += tas2552->tdm_delay;
        }
 
-       pll_enable = snd_soc_component_read32(component, TAS2552_CFG_2) & TAS2552_PLL_ENABLE;
+       pll_enable = snd_soc_component_read(component, TAS2552_CFG_2) & TAS2552_PLL_ENABLE;
        snd_soc_component_update_bits(component, TAS2552_CFG_2, TAS2552_PLL_ENABLE, 0);
 
        if (pll_clkin == pll_clk)
@@ -187,7 +187,7 @@ static int tas2552_setup_pll(struct snd_soc_component *component,
                unsigned int d, q, t;
                u8 j;
                u8 pll_sel = (tas2552->pll_clk_id << 3) & TAS2552_PLL_SRC_MASK;
-               u8 p = snd_soc_component_read32(component, TAS2552_PLL_CTRL_1);
+               u8 p = snd_soc_component_read(component, TAS2552_PLL_CTRL_1);
 
                p = (p >> 7);
 
@@ -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. */