diff options
| author |   Christoph Hellwig <hch@lst.de> | 2018-04-12 07:49:51 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-05-09 06:58:11 +0200 |
| commit | 30fd642758773eb034b1543db26cf730ce12795c (patch) | |
| tree | d7b5426406537cd4cb4cd8773720fa7dc62cfbac /lib | |
| parent | swiotlb: move the SWIOTLB config symbol to lib/Kconfig (diff) | |
| download | linux-dev-30fd642758773eb034b1543db26cf730ce12795c.tar.xz linux-dev-30fd642758773eb034b1543db26cf730ce12795c.zip | |
swiotlb: remove the CONFIG_DMA_DIRECT_OPS ifdefs
swiotlb now selects the DMA_DIRECT_OPS config symbol, so this will
always be true.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/swiotlb.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index bd1e0c5ba1b8..69c732c23773 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c @@ -692,7 +692,6 @@ void swiotlb_tbl_sync_single(struct device *hwdev, phys_addr_t tlb_addr, } } -#ifdef CONFIG_DMA_DIRECT_OPS static inline bool dma_coherent_ok(struct device *dev, dma_addr_t addr, size_t size) { @@ -764,7 +763,6 @@ static bool swiotlb_free_buffer(struct device *dev, size_t size, DMA_ATTR_SKIP_CPU_SYNC); return true; } -#endif static void swiotlb_full(struct device *dev, size_t size, enum dma_data_direction dir, @@ -1045,7 +1043,6 @@ swiotlb_dma_supported(struct device *hwdev, u64 mask) return __phys_to_dma(hwdev, io_tlb_end - 1) <= mask; } -#ifdef CONFIG_DMA_DIRECT_OPS void *swiotlb_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs) { @@ -1089,4 +1086,3 @@ const struct dma_map_ops swiotlb_dma_ops = { .unmap_page = swiotlb_unmap_page, .dma_supported = dma_direct_supported, }; -#endif /* CONFIG_DMA_DIRECT_OPS */ |