X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Farch%2Fmips%2Fcavium-octeon%2Fdma-octeon.c;h=2cd45f5f9481cec75b8e32e384bdcc1396ffeb9b;hb=e09b41010ba33a20a87472ee821fa407a5b8da36;hp=d8960d46417b07ec5e3b0603b2f934efe4c1f54c;hpb=f93b97fd65072de626c074dbe099a1fff05ce060;p=kvmfornfv.git diff --git a/kernel/arch/mips/cavium-octeon/dma-octeon.c b/kernel/arch/mips/cavium-octeon/dma-octeon.c index d8960d464..2cd45f5f9 100644 --- a/kernel/arch/mips/cavium-octeon/dma-octeon.c +++ b/kernel/arch/mips/cavium-octeon/dma-octeon.c @@ -161,9 +161,6 @@ static void *octeon_dma_alloc_coherent(struct device *dev, size_t size, { void *ret; - if (dma_alloc_from_coherent(dev, size, dma_handle, &ret)) - return ret; - /* ignore region specifiers */ gfp &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM); @@ -194,11 +191,6 @@ static void *octeon_dma_alloc_coherent(struct device *dev, size_t size, static void octeon_dma_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle, struct dma_attrs *attrs) { - int order = get_order(size); - - if (dma_release_from_coherent(dev, order, vaddr)) - return; - swiotlb_free_coherent(dev, size, vaddr, dma_handle); }