Merge branch 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

Pull CMA and DMA-mapping updates from Marek Szyprowski:
 "This time the pull request is rather small, because the further
  redesign patches were not ready on time.

  This pull request consists of the patches which extend ARM DMA-mapping
  subsystem with support for CPU coherent (ACP) DMA busses.  The first
  client of the new version is HighBank SATA driver.  The second part of
  the pull request includes various cleanup for both CMA common code and
  ARM DMA-mapping subsystem."

Fix up trivial add-add conflict due to the "dma-coherent" DT property
being added next to the "calxeda,port-phys" property for the Calxeda
AHCI controller.

* 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  ARM: dma-mapping: Remove unsed var at arm_coherent_iommu_unmap_page
  ARM: highbank: add coherent DMA setup
  ARM: kill off arch_is_coherent
  ARM: add coherent iommu dma ops
  ARM: add coherent dma ops
  ARM: dma-mapping: Refrain noisy console message
  ARM: dma-mapping: Small logical clean up
  drivers: dma-contiguous: refactor dma_alloc_from_contiguous()

1 files changed, 7 insertions, 11 deletions

diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c
index 34d94c762a1e..9a1469474f55 100644
--- a/drivers/base/dma-contiguous.c
+++ b/drivers/base/dma-contiguous.c
@@ -315,6 +315,7 @@ struct page *dma_alloc_from_contiguous(struct device *dev, int count,
 {
         unsigned long mask, pfn, pageno, start = 0;
         struct cma *cma = dev_get_cma_area(dev);
+        struct page *page = NULL;
         int ret;
 
         if (!cma || !cma->count)
@@ -336,18 +337,17 @@ struct page *dma_alloc_from_contiguous(struct device *dev, int count,
         for (;;) {
                 pageno = bitmap_find_next_zero_area(cma->bitmap, cma->count,
                                                     start, count, mask);
-                if (pageno >= cma->count) {
-                        ret = -ENOMEM;
-                        goto error;
-                }
+                if (pageno >= cma->count)
+                        break;
 
                 pfn = cma->base_pfn + pageno;
                 ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA);
                 if (ret == 0) {
                         bitmap_set(cma->bitmap, pageno, count);
+                        page = pfn_to_page(pfn);
                         break;
                 } else if (ret != -EBUSY) {
-                        goto error;
+                        break;
                 }
                 pr_debug("%s(): memory range at %p is busy, retrying\n",
                          __func__, pfn_to_page(pfn));
@@ -356,12 +356,8 @@ struct page *dma_alloc_from_contiguous(struct device *dev, int count,
         }
 
         mutex_unlock(&cma_mutex);
-
-        pr_debug("%s(): returned %p\n", __func__, pfn_to_page(pfn));
-        return pfn_to_page(pfn);
-error:
-        mutex_unlock(&cma_mutex);
-        return NULL;
+        pr_debug("%s(): returned %p\n", __func__, page);
+        return page;
 }
 
 /**