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

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

diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c
index df3a750..e21ed93 100644 (file)
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
@@ -832,18 +832,18 @@ static int dac33_hw_params(struct snd_pcm_substream *substream,
                return -EINVAL;
        }
 
-       switch (params_format(params)) {
-       case SNDRV_PCM_FORMAT_S16_LE:
+       switch (params_width(params)) {
+       case 16:
                dac33->fifo_size = DAC33_FIFO_SIZE_16BIT;
                dac33->burst_rate = CALC_BURST_RATE(dac33->burst_bclkdiv, 32);
                break;
-       case SNDRV_PCM_FORMAT_S32_LE:
+       case 32:
                dac33->fifo_size = DAC33_FIFO_SIZE_24BIT;
                dac33->burst_rate = CALC_BURST_RATE(dac33->burst_bclkdiv, 64);
                break;
        default:
-               dev_err(codec->dev, "unsupported format %d\n",
-                       params_format(params));
+               dev_err(codec->dev, "unsupported width %d\n",
+                       params_width(params));
                return -EINVAL;
        }
 
@@ -1404,7 +1404,7 @@ static int dac33_soc_probe(struct snd_soc_codec *codec)
        if (dac33->irq >= 0) {
                ret = request_irq(dac33->irq, dac33_interrupt_handler,
                                  IRQF_TRIGGER_RISING,
-                                 codec->name, codec);
+                                 codec->component.name, codec);
                if (ret < 0) {
                        dev_err(codec->dev, "Could not request IRQ%d (%d)\n",
                                                dac33->irq, ret);