Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[linux-2.6-microblaze.git] / sound / x86 / intel_hdmi_audio.c

diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c
index cd389d2..9f9fcd2 100644 (file)
--- a/sound/x86/intel_hdmi_audio.c
+++ b/sound/x86/intel_hdmi_audio.c
@@ -1132,16 +1132,13 @@ static int had_pcm_hw_params(struct snd_pcm_substream *substream,
                             struct snd_pcm_hw_params *hw_params)
 {
        struct snd_intelhad *intelhaddata;
-       int buf_size, retval;
+       int buf_size;
 
        intelhaddata = snd_pcm_substream_chip(substream);
        buf_size = params_buffer_bytes(hw_params);
-       retval = snd_pcm_lib_malloc_pages(substream, buf_size);
-       if (retval < 0)
-               return retval;
        dev_dbg(intelhaddata->dev, "%s:allocated memory = %d\n",
                __func__, buf_size);
-       return retval;
+       return 0;
 }
 
 /*
@@ -1154,7 +1151,7 @@ static int had_pcm_hw_free(struct snd_pcm_substream *substream)
        intelhaddata = snd_pcm_substream_chip(substream);
        had_do_reset(intelhaddata);
 
-       return snd_pcm_lib_free_pages(substream);
+       return 0;
 }
 
 /*
@@ -1289,7 +1286,6 @@ static int had_pcm_mmap(struct snd_pcm_substream *substream,
 static const struct snd_pcm_ops had_pcm_ops = {
        .open =         had_pcm_open,
        .close =        had_pcm_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .hw_params =    had_pcm_hw_params,
        .hw_free =      had_pcm_hw_free,
        .prepare =      had_pcm_prepare,
@@ -1755,7 +1751,7 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev)
                __func__, (unsigned int)res_mmio->start,
                (unsigned int)res_mmio->end);
 
-       card_ctx->mmio_start = ioremap_nocache(res_mmio->start,
+       card_ctx->mmio_start = ioremap(res_mmio->start,
                                               (size_t)(resource_size(res_mmio)));
        if (!card_ctx->mmio_start) {
                dev_err(&pdev->dev, "Could not get ioremap\n");
@@ -1801,10 +1797,9 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev)
                /* allocate dma pages;
                 * try to allocate 600k buffer as default which is large enough
                 */
-               snd_pcm_lib_preallocate_pages_for_all(pcm,
-                                                     SNDRV_DMA_TYPE_DEV_UC,
-                                                     card->dev,
-                                                     HAD_DEFAULT_BUFFER, HAD_MAX_BUFFER);
+               snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV_UC,
+                                              card->dev, HAD_DEFAULT_BUFFER,
+                                              HAD_MAX_BUFFER);
 
                /* create controls */
                for (i = 0; i < ARRAY_SIZE(had_controls); i++) {