Merge remote-tracking branches 'asoc/fix/tlv320aic3x' and 'asoc/fix/wm8962' into...

[firefly-linux-kernel-4.4.55.git] / sound / soc / codecs / max98925.c

diff --git a/sound/soc/codecs/max98925.c b/sound/soc/codecs/max98925.c
index ce551eecbf95fbd516646d4cb4180b523fef9b70..5990de3179991d94db534cf5dd721833455f23ef 100644 (file)
--- a/sound/soc/codecs/max98925.c
+++ b/sound/soc/codecs/max98925.c
@@ -271,8 +271,6 @@ static inline int max98925_rate_value(struct snd_soc_codec *codec,
                        break;
                }
        }
-       dev_dbg(codec->dev, "%s: sample rate is %d, returning %d\n",
-                               __func__, rate_table[i].rate, *value);
        return ret;
 }
 
@@ -432,7 +430,7 @@ static int max98925_dai_hw_params(struct snd_pcm_substream *substream,
        struct snd_soc_codec *codec = dai->codec;
        struct max98925_priv *max98925 = snd_soc_codec_get_drvdata(codec);
 
-       switch (snd_pcm_format_width(params_format(params))) {
+       switch (params_width(params)) {
        case 16:
                regmap_update_bits(max98925->regmap,
                                MAX98925_FORMAT,
@@ -523,7 +521,6 @@ static int max98925_probe(struct snd_soc_codec *codec)
        struct max98925_priv *max98925 = snd_soc_codec_get_drvdata(codec);
 
        max98925->codec = codec;
-       codec->control_data = max98925->regmap;
        regmap_write(max98925->regmap, MAX98925_GLOBAL_ENABLE, 0x00);
        /* It's not the default but we need to set DAI_DLY */
        regmap_write(max98925->regmap,