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

[sfrench/cifs-2.6.git] / sound / soc / codecs / wm8350.c

diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index 392285edb59545787f336bdc59babdbb5e15e69f..3dfdcc4197fa96cce56a13e50291b9075e44d4a9 100644 (file)
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -918,16 +918,16 @@ static int wm8350_pcm_hw_params(struct snd_pcm_substream *substream,
            ~WM8350_AIF_WL_MASK;
 
        /* bit size */
-       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:
                iface |= 0x1 << 10;
                break;
-       case SNDRV_PCM_FORMAT_S24_LE:
+       case 24:
                iface |= 0x2 << 10;
                break;
-       case SNDRV_PCM_FORMAT_S32_LE:
+       case 32:
                iface |= 0x3 << 10;
                break;
        }
@@ -1341,21 +1341,18 @@ int wm8350_hp_jack_detect(struct snd_soc_codec *codec, enum wm8350_jack which,
 {
        struct wm8350_data *priv = snd_soc_codec_get_drvdata(codec);
        struct wm8350 *wm8350 = priv->wm8350;
-       int irq;
        int ena;
 
        switch (which) {
        case WM8350_JDL:
                priv->hpl.jack = jack;
                priv->hpl.report = report;
-               irq = WM8350_IRQ_CODEC_JCK_DET_L;
                ena = WM8350_JDL_ENA;
                break;
 
        case WM8350_JDR:
                priv->hpr.jack = jack;
                priv->hpr.report = report;
-               irq = WM8350_IRQ_CODEC_JCK_DET_R;
                ena = WM8350_JDR_ENA;
                break;