vserver 1.9.3

[linux-2.6.git] / sound / pci / emu10k1 / memory.c

diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c
index 90e6953..7a595f0 100644 (file)
--- a/sound/pci/emu10k1/memory.c
+++ b/sound/pci/emu10k1/memory.c
@@ -22,6 +22,7 @@
  */
 
 #include <sound/driver.h>
+#include <linux/pci.h>
 #include <linux/time.h>
 #include <sound/core.h>
 #include <sound/emu10k1.h>
@@ -291,7 +292,7 @@ snd_util_memblk_t *
 snd_emu10k1_alloc_pages(emu10k1_t *emu, snd_pcm_substream_t *substream)
 {
        snd_pcm_runtime_t *runtime = substream->runtime;
-       struct snd_sg_buf *sgbuf = runtime->dma_private;
+       struct snd_sg_buf *sgbuf = snd_pcm_substream_sgbuf(substream);
        snd_util_memhdr_t *hdr;
        emu10k1_memblk_t *blk;
        int page, err, idx;
@@ -441,10 +442,11 @@ static int synth_alloc_pages(emu10k1_t *emu, emu10k1_memblk_t *blk)
        get_single_page_range(emu->memhdr, blk, &first_page, &last_page);
        /* allocate kernel pages */
        for (page = first_page; page <= last_page; page++) {
-               if (snd_dma_alloc_pages(&emu->dma_dev, PAGE_SIZE, &dmab) < 0)
+               if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(emu->pci),
+                                       PAGE_SIZE, &dmab) < 0)
                        goto __fail;
                if (! is_valid_page(emu, dmab.addr)) {
-                       snd_dma_free_pages(&emu->dma_dev, &dmab);
+                       snd_dma_free_pages(&dmab);
                        goto __fail;
                }
                emu->page_addr_table[page] = dmab.addr;
@@ -459,7 +461,7 @@ __fail:
                dmab.area = emu->page_ptr_table[page];
                dmab.addr = emu->page_addr_table[page];
                dmab.bytes = PAGE_SIZE;
-               snd_dma_free_pages(&emu->dma_dev, &dmab);
+               snd_dma_free_pages(&dmab);
                emu->page_addr_table[page] = 0;
                emu->page_ptr_table[page] = NULL;
        }
@@ -476,13 +478,15 @@ static int synth_free_pages(emu10k1_t *emu, emu10k1_memblk_t *blk)
        struct snd_dma_buffer dmab;
 
        get_single_page_range(emu->memhdr, blk, &first_page, &last_page);
+       dmab.dev.type = SNDRV_DMA_TYPE_DEV;
+       dmab.dev.dev = snd_dma_pci_data(emu->pci);
        for (page = first_page; page <= last_page; page++) {
                if (emu->page_ptr_table[page] == NULL)
                        continue;
                dmab.area = emu->page_ptr_table[page];
                dmab.addr = emu->page_addr_table[page];
                dmab.bytes = PAGE_SIZE;
-               snd_dma_free_pages(&emu->dma_dev, &dmab);
+               snd_dma_free_pages(&dmab);
                emu->page_addr_table[page] = 0;
                emu->page_ptr_table[page] = NULL;
        }