1 files changed, 18 insertions, 20 deletions

diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c
index 00fc9241d266..3318c15e324a 100644
--- a/sound/mips/hal2.c
+++ b/sound/mips/hal2.c
@@ -264,7 +264,7 @@ static int hal2_gain_put(struct snd_kcontrol *kcontrol,
         return old != new;
 }
 
-static struct snd_kcontrol_new hal2_ctrl_headphone = {
+static const struct snd_kcontrol_new hal2_ctrl_headphone = {
         .iface          = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name           = "Headphone Playback Volume",
         .access         = SNDRV_CTL_ELEM_ACCESS_READWRITE,
@@ -274,7 +274,7 @@ static struct snd_kcontrol_new hal2_ctrl_headphone = {
         .put            = hal2_gain_put,
 };
 
-static struct snd_kcontrol_new hal2_ctrl_mic = {
+static const struct snd_kcontrol_new hal2_ctrl_mic = {
         .iface          = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name           = "Mic Capture Volume",
         .access         = SNDRV_CTL_ELEM_ACCESS_READWRITE,
@@ -461,15 +461,15 @@ static int hal2_alloc_dmabuf(struct hal2_codec *codec)
         int count = H2_BUF_SIZE / H2_BLOCK_SIZE;
         int i;
 
-        codec->buffer = dma_alloc_noncoherent(NULL, H2_BUF_SIZE,
-                                              &buffer_dma, GFP_KERNEL);
+        codec->buffer = dma_alloc_attrs(NULL, H2_BUF_SIZE, &buffer_dma,
+                                        GFP_KERNEL, DMA_ATTR_NON_CONSISTENT);
         if (!codec->buffer)
                 return -ENOMEM;
-        desc = dma_alloc_noncoherent(NULL, count * sizeof(struct hal2_desc),
-                                     &desc_dma, GFP_KERNEL);
+        desc = dma_alloc_attrs(NULL, count * sizeof(struct hal2_desc),
+                               &desc_dma, GFP_KERNEL, DMA_ATTR_NON_CONSISTENT);
         if (!desc) {
-                dma_free_noncoherent(NULL, H2_BUF_SIZE,
-                                     codec->buffer, buffer_dma);
+                dma_free_attrs(NULL, H2_BUF_SIZE, codec->buffer, buffer_dma,
+                               DMA_ATTR_NON_CONSISTENT);
                 return -ENOMEM;
         }
         codec->buffer_dma = buffer_dma;
@@ -490,10 +490,10 @@ static int hal2_alloc_dmabuf(struct hal2_codec *codec)
 
 static void hal2_free_dmabuf(struct hal2_codec *codec)
 {
-        dma_free_noncoherent(NULL, codec->desc_count * sizeof(struct hal2_desc),
-                             codec->desc, codec->desc_dma);
-        dma_free_noncoherent(NULL, H2_BUF_SIZE, codec->buffer,
-                             codec->buffer_dma);
+        dma_free_attrs(NULL, codec->desc_count * sizeof(struct hal2_desc),
+                       codec->desc, codec->desc_dma, DMA_ATTR_NON_CONSISTENT);
+        dma_free_attrs(NULL, H2_BUF_SIZE, codec->buffer, codec->buffer_dma,
+                       DMA_ATTR_NON_CONSISTENT);
 }
 
 static struct snd_pcm_hardware hal2_pcm_hw = {
@@ -616,10 +616,9 @@ static int hal2_playback_ack(struct snd_pcm_substream *substream)
         struct hal2_codec *dac = &hal2->dac;
 
         dac->pcm_indirect.hw_queue_size = H2_BUF_SIZE / 2;
-        snd_pcm_indirect_playback_transfer(substream,
-                                           &dac->pcm_indirect,
-                                           hal2_playback_transfer);
-        return 0;
+        return snd_pcm_indirect_playback_transfer(substream,
+                                                  &dac->pcm_indirect,
+                                                  hal2_playback_transfer);
 }
 
 static int hal2_capture_open(struct snd_pcm_substream *substream)
@@ -707,10 +706,9 @@ static int hal2_capture_ack(struct snd_pcm_substream *substream)
         struct snd_hal2 *hal2 = snd_pcm_substream_chip(substream);
         struct hal2_codec *adc = &hal2->adc;
 
-        snd_pcm_indirect_capture_transfer(substream,
-                                          &adc->pcm_indirect,
-                                          hal2_capture_transfer);
-        return 0;
+        return snd_pcm_indirect_capture_transfer(substream,
+                                                 &adc->pcm_indirect,
+                                                 hal2_capture_transfer);
 }
 
 static struct snd_pcm_ops hal2_playback_ops = {