Merge tag 'dma-mapping-5.3' of git://git.infradead.org/users/hch/dma-mapping

[linux-2.6-block.git] / arch / xtensa / kernel / pci-dma.c

diff --git a/arch/xtensa/kernel/pci-dma.c b/arch/xtensa/kernel/pci-dma.c
index a87f8a308cc1bcc057fd05765a838867399b44f3..65f05776d827fecbae83a0552dac4324cd255847 100644 (file)
--- a/arch/xtensa/kernel/pci-dma.c
+++ b/arch/xtensa/kernel/pci-dma.c
@@ -163,10 +163,6 @@ void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
 
        *handle = phys_to_dma(dev, page_to_phys(page));
 
-       if (attrs & DMA_ATTR_NO_KERNEL_MAPPING) {
-               return page;
-       }
-
 #ifdef CONFIG_MMU
        if (PageHighMem(page)) {
                void *p;
@@ -192,9 +188,7 @@ void arch_dma_free(struct device *dev, size_t size, void *vaddr,
        unsigned long count = PAGE_ALIGN(size) >> PAGE_SHIFT;
        struct page *page;
 
-       if (attrs & DMA_ATTR_NO_KERNEL_MAPPING) {
-               page = vaddr;
-       } else if (platform_vaddr_uncached(vaddr)) {
+       if (platform_vaddr_uncached(vaddr)) {
                page = virt_to_page(platform_vaddr_to_cached(vaddr));
        } else {
 #ifdef CONFIG_MMU