Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux.git] / kernel / dma / mapping.c

diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
index c000906348c936162e1dc4cd7faa1147a57c6d8e..f7afdadb6770bb96b50cd4285b65b887813d2ea5 100644 (file)
--- a/kernel/dma/mapping.c
+++ b/kernel/dma/mapping.c
@@ -238,17 +238,13 @@ u64 dma_get_required_mask(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(dma_get_required_mask);
 
-#ifndef arch_dma_alloc_attrs
-#define arch_dma_alloc_attrs(dev)      (true)
-#endif
-
 void *dma_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle,
                gfp_t flag, unsigned long attrs)
 {
        const struct dma_map_ops *ops = get_dma_ops(dev);
        void *cpu_addr;
 
-       WARN_ON_ONCE(dev && !dev->coherent_dma_mask);
+       WARN_ON_ONCE(!dev->coherent_dma_mask);
 
        if (dma_alloc_from_dev_coherent(dev, size, dma_handle, &cpu_addr))
                return cpu_addr;
@@ -256,9 +252,6 @@ void *dma_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle,
        /* let the implementation decide on the zone to allocate from: */
        flag &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM);
 
-       if (!arch_dma_alloc_attrs(&dev))
-               return NULL;
-
        if (dma_is_direct(ops))
                cpu_addr = dma_direct_alloc(dev, size, dma_handle, flag, attrs);
        else if (ops->alloc)