korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

dma-direct: consolidate the error handling in dma_direct_alloc_pages

Browse Source 
Use a goto label to merge two error return cases.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
This commit is contained in:
Christoph Hellwig 2020-02-21 12:26:00 -08:00
parent 4f8232bbf8
commit 3d0fc341c4
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kernel/dma/direct.c
View File

@ -169,11 +169,8 @@ void *dma_direct_alloc_pages(struct device *dev, size_t size,
ret = dma_common_contiguous_remap(page, PAGE_ALIGN(size), ret = dma_common_contiguous_remap(page, PAGE_ALIGN(size),
dma_pgprot(dev, PAGE_KERNEL, attrs), dma_pgprot(dev, PAGE_KERNEL, attrs),
__builtin_return_address(0)); __builtin_return_address(0));
if (!ret) { if (!ret)
dma_free_contiguous(dev, page, size); goto out_free_pages;
return ret;
}
memset(ret, 0, size); memset(ret, 0, size);
goto done; goto done;
} }
@ -186,8 +183,7 @@ void *dma_direct_alloc_pages(struct device *dev, size_t size,
* so log an error and fail. * so log an error and fail.
*/ */
dev_info(dev, "Rejecting highmem page from CMA.\n"); dev_info(dev, "Rejecting highmem page from CMA.\n");
dma_free_contiguous(dev, page, size); goto out_free_pages;
return NULL;
} }
ret = page_address(page); ret = page_address(page);
@ -207,6 +203,9 @@ done:
else else
*dma_handle = phys_to_dma(dev, page_to_phys(page)); *dma_handle = phys_to_dma(dev, page_to_phys(page));
return ret; return ret;
out_free_pages:
dma_free_contiguous(dev, page, size);
return NULL;
} }
void dma_direct_free_pages(struct device *dev, size_t size, void *cpu_addr, void dma_direct_free_pages(struct device *dev, size_t size, void *cpu_addr,