1 files changed, 6 insertions, 9 deletions

diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c
index 0f5780c09f3a..ee380190399f 100644
--- a/sound/soc/codecs/wm8985.c
+++ b/sound/soc/codecs/wm8985.c
@@ -698,22 +698,22 @@ static int wm8985_hw_params(struct snd_pcm_substream *substream,
         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 @@ static int wm8985_resume(struct snd_soc_codec *codec)
 
 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;
 }