Merge remote-tracking branch 'asoc/topic/wm8985' into asoc-next

diff --combined sound/soc/codecs/wm8985.c
index b0f643458e0aa530b16b3d16787d1b1a0917218e,cbbdfbbd0a9f1e10a3b9040677d34dc2f9e85773..ee380190399fffa8aeb594ee9911d5560988627b
--- 1/sound/soc/codecs/wm8985.c
--- 2/sound/soc/codecs/wm8985.c
+++ b/sound/soc/codecs/wm8985.c
@@@ -698,22 -698,22 +698,22 @@@ static int wm8985_hw_params(struct snd_
        if ((int)wm8985->bclk < 0)
                return wm8985->bclk;
  
 -      switch (params_format(params)) {
 -      case SNDRV_PCM_FORMAT_S16_LE:
 +      switch (params_width(params)) {
 +      case 16:
                blen = 0x0;
                break;
 -      case SNDRV_PCM_FORMAT_S20_3LE:
 +      case 20:
                blen = 0x1;
                break;
 -      case SNDRV_PCM_FORMAT_S24_LE:
 +      case 24:
                blen = 0x2;
                break;
 -      case SNDRV_PCM_FORMAT_S32_LE:
 +      case 32:
                blen = 0x3;
                break;
        default:
                dev_err(dai->dev, "Unsupported word length %u\n",
 -                      params_format(params));
 +                      params_width(params));
                return -EINVAL;
        }
  
@@@ -980,9 -980,6 +980,6 @@@ static int wm8985_resume(struct snd_soc
  
  static int wm8985_remove(struct snd_soc_codec *codec)
  {
-       struct wm8985_priv *wm8985;
- 
-       wm8985 = snd_soc_codec_get_drvdata(codec);
        wm8985_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;
  }