diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-02 17:04:49 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-02 17:04:49 +1000 |
commit | a3ca10a4f626dfa6ae8e88991ec1358672adbbad (patch) | |
tree | 94e9ab05b609f6d0194f7183ee95969e53f0c96c /arch/mips/netlogic/common/nlm-dma.c | |
parent | f9f9aacccfcf91e35ddf95f19c074f37a6a21b81 (diff) | |
parent | dbc87b382056d9cdd703b2160f0ad08f5c488357 (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/mips/netlogic/common/nlm-dma.c')
-rw-r--r-- | arch/mips/netlogic/common/nlm-dma.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/mips/netlogic/common/nlm-dma.c b/arch/mips/netlogic/common/nlm-dma.c index f3d4ae87abc7..3e4f3bb1cf59 100644 --- a/arch/mips/netlogic/common/nlm-dma.c +++ b/arch/mips/netlogic/common/nlm-dma.c @@ -49,9 +49,6 @@ static void *nlm_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); @@ -69,11 +66,6 @@ static void *nlm_dma_alloc_coherent(struct device *dev, size_t size, static void nlm_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); } |