Merge remote-tracking branches 'asoc/topic/tlv320aic3x', 'asoc/topic/width', 'asoc...

[uclinux-h8/linux.git] / sound / soc / codecs / wm8904.c

diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index da46c2a..4d2d2b1 100644 (file)
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -1292,16 +1292,16 @@ static int wm8904_hw_params(struct snd_pcm_substream *substream,
                wm8904->bclk = snd_soc_params_to_bclk(params);
        }
 
-       switch (params_format(params)) {
-       case SNDRV_PCM_FORMAT_S16_LE:
+       switch (params_width(params)) {
+       case 16:
                break;
-       case SNDRV_PCM_FORMAT_S20_3LE:
+       case 20:
                aif1 |= 0x40;
                break;
-       case SNDRV_PCM_FORMAT_S24_LE:
+       case 24:
                aif1 |= 0x80;
                break;
-       case SNDRV_PCM_FORMAT_S32_LE:
+       case 32:
                aif1 |= 0xc0;
                break;
        default:
@@ -2017,12 +2017,8 @@ static void wm8904_handle_pdata(struct snd_soc_codec *codec)
                /* We need an array of texts for the enum API */
                wm8904->drc_texts = kmalloc(sizeof(char *)
                                            * pdata->num_drc_cfgs, GFP_KERNEL);
-               if (!wm8904->drc_texts) {
-                       dev_err(codec->dev,
-                               "Failed to allocate %d DRC config texts\n",
-                               pdata->num_drc_cfgs);
+               if (!wm8904->drc_texts)
                        return;
-               }
 
                for (i = 0; i < pdata->num_drc_cfgs; i++)
                        wm8904->drc_texts[i] = pdata->drc_cfgs[i].name;