include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[mv-sheeva.git] / sound / pci / emu10k1 / memory.c

diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c
index 7d379f5131fbf61d4ab527a51bac881592c96fff..ffb1ddb8dc28ea1d3fbdf574d0c4efbef9772c98 100644 (file)
--- a/sound/pci/emu10k1/memory.c
+++ b/sound/pci/emu10k1/memory.c
@@ -22,6 +22,7 @@
  */
 
 #include <linux/pci.h>
+#include <linux/gfp.h>
 #include <linux/time.h>
 #include <linux/mutex.h>
 
@@ -107,7 +108,8 @@ static int search_empty_map_area(struct snd_emu10k1 *emu, int npages, struct lis
 
        list_for_each (pos, &emu->mapped_link_head) {
                struct snd_emu10k1_memblk *blk = get_emu10k1_memblk(pos, mapped_link);
-               snd_assert(blk->mapped_page >= 0, continue);
+               if (blk->mapped_page < 0)
+                       continue;
                size = blk->mapped_page - page;
                if (size == npages) {
                        *nextp = pos;
@@ -295,15 +297,18 @@ struct snd_util_memblk *
 snd_emu10k1_alloc_pages(struct snd_emu10k1 *emu, struct snd_pcm_substream *substream)
 {
        struct snd_pcm_runtime *runtime = substream->runtime;
-       struct snd_sg_buf *sgbuf = snd_pcm_substream_sgbuf(substream);
        struct snd_util_memhdr *hdr;
        struct snd_emu10k1_memblk *blk;
        int page, err, idx;
 
-       snd_assert(emu, return NULL);
-       snd_assert(runtime->dma_bytes > 0 && runtime->dma_bytes < MAXPAGES * EMUPAGESIZE, return NULL);
+       if (snd_BUG_ON(!emu))
+               return NULL;
+       if (snd_BUG_ON(runtime->dma_bytes <= 0 ||
+                      runtime->dma_bytes >= MAXPAGES * EMUPAGESIZE))
+               return NULL;
        hdr = emu->memhdr;
-       snd_assert(hdr, return NULL);
+       if (snd_BUG_ON(!hdr))
+               return NULL;
 
        mutex_lock(&hdr->block_mutex);
        blk = search_empty(emu, runtime->dma_bytes);
@@ -316,16 +321,9 @@ snd_emu10k1_alloc_pages(struct snd_emu10k1 *emu, struct snd_pcm_substream *subst
         */
        idx = 0;
        for (page = blk->first_page; page <= blk->last_page; page++, idx++) {
+               unsigned long ofs = idx << PAGE_SHIFT;
                dma_addr_t addr;
-#ifdef CONFIG_SND_DEBUG
-               if (idx >= sgbuf->pages) {
-                       printk(KERN_ERR "emu: pages overflow! (%d-%d) for %d\n",
-                              blk->first_page, blk->last_page, sgbuf->pages);
-                       mutex_unlock(&hdr->block_mutex);
-                       return NULL;
-               }
-#endif
-               addr = sgbuf->table[idx].addr;
+               addr = snd_pcm_sgbuf_get_addr(substream, ofs);
                if (! is_valid_page(emu, addr)) {
                        printk(KERN_ERR "emu: failure page = %d\n", idx);
                        mutex_unlock(&hdr->block_mutex);
@@ -353,7 +351,8 @@ snd_emu10k1_alloc_pages(struct snd_emu10k1 *emu, struct snd_pcm_substream *subst
  */
 int snd_emu10k1_free_pages(struct snd_emu10k1 *emu, struct snd_util_memblk *blk)
 {
-       snd_assert(emu && blk, return -EINVAL);
+       if (snd_BUG_ON(!emu || !blk))
+               return -EINVAL;
        return snd_emu10k1_synth_free(emu, blk);
 }
 
@@ -498,7 +497,8 @@ static int synth_free_pages(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *
 static inline void *offset_ptr(struct snd_emu10k1 *emu, int page, int offset)
 {
        char *ptr;
-       snd_assert(page >= 0 && page < emu->max_cache_pages, return NULL);
+       if (snd_BUG_ON(page < 0 || page >= emu->max_cache_pages))
+               return NULL;
        ptr = emu->page_ptr_table[page];
        if (! ptr) {
                printk(KERN_ERR "emu10k1: access to NULL ptr: page = %d\n", page);