ASoC: ac108: Fix changed interface

[platform/kernel/linux-rpi.git] / sound / soc / codecs / ac108.c

diff --git a/sound/soc/codecs/ac108.c b/sound/soc/codecs/ac108.c
index 0609bef..4462812 100644 (file)
--- a/sound/soc/codecs/ac108.c
+++ b/sound/soc/codecs/ac108.c
@@ -653,7 +653,8 @@ static int ac108_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_h
 
        dev_dbg(dai->dev, "%s() stream=%s play:%d capt:%d +++\n", __func__,
                        snd_pcm_stream_str(substream),
-                       dai->playback_active, dai->capture_active);
+                       dai->stream_active[SNDRV_PCM_STREAM_PLAYBACK],
+                       dai->stream_active[SNDRV_PCM_STREAM_CAPTURE]);
 
        if (ac10x->i2c101) {
                ret = ac101_hw_params(substream, params, dai);
@@ -664,8 +665,10 @@ static int ac108_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_h
                }
        }
 
-       if ((substream->stream == SNDRV_PCM_STREAM_CAPTURE && dai->playback_active)
-        || (substream->stream == SNDRV_PCM_STREAM_PLAYBACK && dai->capture_active)) {
+       if ((substream->stream == SNDRV_PCM_STREAM_CAPTURE &&
+           dai->stream_active[SNDRV_PCM_STREAM_PLAYBACK])
+           || (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
+           dai->stream_active[SNDRV_PCM_STREAM_CAPTURE])) {
                /* not configure hw_param twice */
                /* return 0; */
        }
@@ -1083,7 +1086,7 @@ void ac108_aif_shutdown(struct snd_pcm_substream *substream,
        }
 }
 
-int ac108_aif_mute(struct snd_soc_dai *dai, int mute) {
+int ac108_aif_mute(struct snd_soc_dai *dai, int mute, int direction) {
        struct snd_soc_codec *codec = dai->codec;
        struct ac10x_priv *ac10x = snd_soc_codec_get_drvdata(codec);
 
@@ -1103,7 +1106,7 @@ static const struct snd_soc_dai_ops ac108_dai_ops = {
        /*ALSA PCM audio operations*/
        .hw_params      = ac108_hw_params,
        .prepare        = ac108_prepare,
-       .digital_mute   = ac108_aif_mute,
+       .mute_stream    = ac108_aif_mute,
 
        /*DAI format configuration*/
        .set_fmt        = ac108_set_fmt,