Commit f5d3939a authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

dma-direct: drop two CONFIG_DMA_RESTRICTED_POOL conditionals 



swiotlb_alloc and swiotlb_free are properly stubbed out if
CONFIG_DMA_RESTRICTED_POOL is not set, so skip the extra checks.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
parent 78bc7278

kernel/dma/direct.c

+2 −4
Original line number Diff line number Diff line
@@ -97,8 +97,7 @@ static int dma_set_encrypted(struct device *dev, void *vaddr, size_t size) 
static void __dma_direct_free_pages(struct device *dev, struct page *page,

				    size_t size)

{

	if (IS_ENABLED(CONFIG_DMA_RESTRICTED_POOL) &&

	    swiotlb_free(dev, page, size))

	if (swiotlb_free(dev, page, size))

		return;

	dma_free_contiguous(dev, page, size);

}
@@ -114,8 +113,7 @@ static struct page *__dma_direct_alloc_pages(struct device *dev, size_t size, 


	gfp |= dma_direct_optimal_gfp_mask(dev, dev->coherent_dma_mask,

					   &phys_limit);

	if (IS_ENABLED(CONFIG_DMA_RESTRICTED_POOL) &&

	    is_swiotlb_for_alloc(dev)) {

	if (is_swiotlb_for_alloc(dev)) {

		page = swiotlb_alloc(dev, size);

		if (page && !dma_coherent_ok(dev, page_to_phys(page), size)) {

			__dma_direct_free_pages(dev, page, size);