ALSA: Remove memory reservation code from memalloc helper

Nowadays we have CMA for obtaining the contiguous memory pages
efficiently.  Let's kill the old kludge for reserving the memory pages
for large buffers.  It was rarely useful (only for preserving pages
among module reloading or a little help by an early boot scripting),
used only by a couple of drivers, and yet it gives too much ugliness
than its benefit.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

3 files changed, 17 insertions, 31 deletions

diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index b0e3d92c4656..772cc36f951d 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -1422,7 +1422,7 @@ static void snd_es1968_free_dmabuf(struct es1968 *chip)
 
         if (! chip->dma.area)
                 return;
-        snd_dma_reserve_buf(&chip->dma, snd_dma_pci_buf_id(chip->pci));
+        snd_dma_free_pages(&chip->dma);
         while ((p = chip->buf_list.next) != &chip->buf_list) {
                 struct esm_memory *chunk = list_entry(p, struct esm_memory, list);
                 list_del(p);
@@ -1438,20 +1438,18 @@ snd_es1968_init_dmabuf(struct es1968 *chip)
 
         chip->dma.dev.type = SNDRV_DMA_TYPE_DEV;
         chip->dma.dev.dev = snd_dma_pci_data(chip->pci);
-        if (! snd_dma_get_reserved_buf(&chip->dma, snd_dma_pci_buf_id(chip->pci))) {
-                err = snd_dma_alloc_pages_fallback(SNDRV_DMA_TYPE_DEV,
-                                                   snd_dma_pci_data(chip->pci),
-                                                   chip->total_bufsize, &chip->dma);
-                if (err < 0 || ! chip->dma.area) {
-                        snd_printk(KERN_ERR "es1968: can't allocate dma pages for size %d\n",
-                                   chip->total_bufsize);
-                        return -ENOMEM;
-                }
-                if ((chip->dma.addr + chip->dma.bytes - 1) & ~((1 << 28) - 1)) {
-                        snd_dma_free_pages(&chip->dma);
-                        snd_printk(KERN_ERR "es1968: DMA buffer beyond 256MB.\n");
-                        return -ENOMEM;
-                }
+        err = snd_dma_alloc_pages_fallback(SNDRV_DMA_TYPE_DEV,
+                                           snd_dma_pci_data(chip->pci),
+                                           chip->total_bufsize, &chip->dma);
+        if (err < 0 || ! chip->dma.area) {
+                snd_printk(KERN_ERR "es1968: can't allocate dma pages for size %d\n",
+                           chip->total_bufsize);
+                return -ENOMEM;
+        }
+        if ((chip->dma.addr + chip->dma.bytes - 1) & ~((1 << 28) - 1)) {
+                snd_dma_free_pages(&chip->dma);
+                snd_printk(KERN_ERR "es1968: DMA buffer beyond 256MB.\n");
+                return -ENOMEM;
         }
 
         INIT_LIST_HEAD(&chip->buf_list);
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index f59a321a6d6a..bd90c80bb494 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -584,10 +584,6 @@ static int snd_hammerfall_get_buffer(struct pci_dev *pci, struct snd_dma_buffer
 {
         dmab->dev.type = SNDRV_DMA_TYPE_DEV;
         dmab->dev.dev = snd_dma_pci_data(pci);
-        if (snd_dma_get_reserved_buf(dmab, snd_dma_pci_buf_id(pci))) {
-                if (dmab->bytes >= size)
-                        return 0;
-        }
         if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
                                 size, dmab) < 0)
                 return -ENOMEM;
@@ -596,10 +592,8 @@ static int snd_hammerfall_get_buffer(struct pci_dev *pci, struct snd_dma_buffer
 
 static void snd_hammerfall_free_buffer(struct snd_dma_buffer *dmab, struct pci_dev *pci)
 {
-        if (dmab->area) {
-                dmab->dev.dev = NULL; /* make it anonymous */
-                snd_dma_reserve_buf(dmab, snd_dma_pci_buf_id(pci));
-        }
+        if (dmab->area)
+                snd_dma_free_pages(dmab);
 }
 
 
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c
index 3717f2dd30be..1503ee3585fd 100644
--- a/sound/pci/rme9652/rme9652.c
+++ b/sound/pci/rme9652/rme9652.c
@@ -294,10 +294,6 @@ static int snd_hammerfall_get_buffer(struct pci_dev *pci, struct snd_dma_buffer
 {
         dmab->dev.type = SNDRV_DMA_TYPE_DEV;
         dmab->dev.dev = snd_dma_pci_data(pci);
-        if (snd_dma_get_reserved_buf(dmab, snd_dma_pci_buf_id(pci))) {
-                if (dmab->bytes >= size)
-                        return 0;
-        }
         if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
                                 size, dmab) < 0)
                 return -ENOMEM;
@@ -306,10 +302,8 @@ static int snd_hammerfall_get_buffer(struct pci_dev *pci, struct snd_dma_buffer
 
 static void snd_hammerfall_free_buffer(struct snd_dma_buffer *dmab, struct pci_dev *pci)
 {
-        if (dmab->area) {
-                dmab->dev.dev = NULL; /* make it anonymous */
-                snd_dma_reserve_buf(dmab, snd_dma_pci_buf_id(pci));
-        }
+        if (dmab->area)
+                snd_dma_free_pages(dmab);
 }