diff options
| author | Christoph Hellwig <hch@lst.de> | 2021-10-21 09:34:59 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2021-12-07 12:50:10 +0100 |
| commit | f5d3939a5916c0a8a0b47dcbc33963dbffe74f90 (patch) | |
| tree | 973c36e5c2265935f6efe932f23aa794aaaf6bf0 /kernel/dma | |
| parent | 78bc72787ab9e638173aeb1f589578105d3a43c9 (diff) | |
| download | linux-stable-f5d3939a5916c0a8a0b47dcbc33963dbffe74f90.tar.gz linux-stable-f5d3939a5916c0a8a0b47dcbc33963dbffe74f90.tar.bz2 linux-stable-f5d3939a5916c0a8a0b47dcbc33963dbffe74f90.zip | |
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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Diffstat (limited to 'kernel/dma')
| -rw-r--r-- | kernel/dma/direct.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index 84226a764471..cf75bfb2f499 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -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); |