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

[linux-2.6-microblaze.git] / sound / soc / codecs / wm8994.c

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 247b390..6cc0566 100644 (file)
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -2815,19 +2815,19 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream,
        }
 
        bclk_rate = params_rate(params);
-       switch (params_format(params)) {
-       case SNDRV_PCM_FORMAT_S16_LE:
+       switch (params_width(params)) {
+       case 16:
                bclk_rate *= 16;
                break;
-       case SNDRV_PCM_FORMAT_S20_3LE:
+       case 20:
                bclk_rate *= 20;
                aif1 |= 0x20;
                break;
-       case SNDRV_PCM_FORMAT_S24_LE:
+       case 24:
                bclk_rate *= 24;
                aif1 |= 0x40;
                break;
-       case SNDRV_PCM_FORMAT_S32_LE:
+       case 32:
                bclk_rate *= 32;
                aif1 |= 0x60;
                break;
@@ -2966,16 +2966,16 @@ static int wm8994_aif3_hw_params(struct snd_pcm_substream *substream,
                return 0;
        }
 
-       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 |= 0x20;
                break;
-       case SNDRV_PCM_FORMAT_S24_LE:
+       case 24:
                aif1 |= 0x40;
                break;
-       case SNDRV_PCM_FORMAT_S32_LE:
+       case 32:
                aif1 |= 0x60;
                break;
        default:
@@ -3296,12 +3296,8 @@ static void wm8994_handle_pdata(struct wm8994_priv *wm8994)
                /* We need an array of texts for the enum API */
                wm8994->drc_texts = devm_kzalloc(wm8994->hubs.codec->dev,
                            sizeof(char *) * pdata->num_drc_cfgs, GFP_KERNEL);
-               if (!wm8994->drc_texts) {
-                       dev_err(wm8994->hubs.codec->dev,
-                               "Failed to allocate %d DRC config texts\n",
-                               pdata->num_drc_cfgs);
+               if (!wm8994->drc_texts)
                        return;
-               }
 
                for (i = 0; i < pdata->num_drc_cfgs; i++)
                        wm8994->drc_texts[i] = pdata->drc_cfgs[i].name;
@@ -3505,6 +3501,7 @@ static irqreturn_t wm8994_mic_irq(int irq, void *data)
        return IRQ_HANDLED;
 }
 
+/* Should be called with accdet_lock held */
 static void wm1811_micd_stop(struct snd_soc_codec *codec)
 {
        struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
@@ -3512,14 +3509,10 @@ static void wm1811_micd_stop(struct snd_soc_codec *codec)
        if (!wm8994->jackdet)
                return;
 
-       mutex_lock(&wm8994->accdet_lock);
-
        snd_soc_update_bits(codec, WM8958_MIC_DETECT_1, WM8958_MICD_ENA, 0);
 
        wm1811_jackdet_set_mode(codec, WM1811_JACKDET_MODE_JACK);
 
-       mutex_unlock(&wm8994->accdet_lock);
-
        if (wm8994->wm8994->pdata.jd_ext_cap)
                snd_soc_dapm_disable_pin(&codec->dapm,
                                         "MICBIAS2");
@@ -3560,10 +3553,10 @@ static void wm8958_open_circuit_work(struct work_struct *work)
                                                  open_circuit_work.work);
        struct device *dev = wm8994->wm8994->dev;
 
-       wm1811_micd_stop(wm8994->hubs.codec);
-
        mutex_lock(&wm8994->accdet_lock);
 
+       wm1811_micd_stop(wm8994->hubs.codec);
+
        dev_dbg(dev, "Reporting open circuit\n");
 
        wm8994->jack_mic = false;