[12/12] swiotlb: remove the CONFIG_DMA_DIRECT_OPS ifdefs

Message ID	20180415145947.1248-13-hch@lst.de
State	Not Applicable
Delegated to:	David Miller
Headers	show Return-Path: <linux-ide-owner@vger.kernel.org> From: Christoph Hellwig <hch@lst.de> To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>, iommu@lists.linux-foundation.org Cc: x86@kernel.org, linux-block@vger.kernel.org, linux-pci@vger.kernel.org, linux-mm@kvack.org, linux-ide@vger.kernel.org, linux-mips@linux-mips.org, sparclinux@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 12/12] swiotlb: remove the CONFIG_DMA_DIRECT_OPS ifdefs Date: Sun, 15 Apr 2018 16:59:47 +0200 Message-Id: <20180415145947.1248-13-hch@lst.de> In-Reply-To: <20180415145947.1248-1-hch@lst.de> References: <20180415145947.1248-1-hch@lst.de> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk
Series	[01/12] iommu-common: move to arch/sparc \| expand [01/12] iommu-common: move to arch/sparc [02/12] iommu-helper: unexport iommu_area_alloc [03/12] iommu-helper: mark iommu_is_span_boundary as inline [04/12] iommu-helper: move the IOMMU_HELPER config symbol to lib/ [05/12] scatterlist: move the NEED_SG_DMA_LENGTH config symbol to lib/Kconfig [06/12] dma-mapping: move the NEED_DMA_MAP_STATE config symbol to lib/Kconfig [07/12] arch: remove the ARCH_PHYS_ADDR_T_64BIT config symbol [08/12] arch: define the ARCH_DMA_ADDR_T_64BIT config symbol in lib/Kconfig [09/12] PCI: remove CONFIG_PCI_BUS_ADDR_T_64BIT [10/12] arm: don't build swiotlb by default [11/12] swiotlb: move the SWIOTLB config symbol to lib/Kconfig [12/12] swiotlb: remove the CONFIG_DMA_DIRECT_OPS ifdefs

Message ID

20180415145947.1248-13-hch@lst.de

State

Not Applicable

Delegated to:

David Miller

Headers

From: Christoph Hellwig <hch@lst.de>
To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
	iommu@lists.linux-foundation.org
Cc: x86@kernel.org, linux-block@vger.kernel.org,
	linux-pci@vger.kernel.org, linux-mm@kvack.org,
	linux-ide@vger.kernel.org, linux-mips@linux-mips.org,
	sparclinux@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH 12/12] swiotlb: remove the CONFIG_DMA_DIRECT_OPS ifdefs
Date: Sun, 15 Apr 2018 16:59:47 +0200
Message-Id: <20180415145947.1248-13-hch@lst.de>
In-Reply-To: <20180415145947.1248-1-hch@lst.de>
References: <20180415145947.1248-1-hch@lst.de>
Sender: linux-ide-owner@vger.kernel.org
Precedence: bulk

Series

[01/12] iommu-common: move to arch/sparc | expand

Commit Message

Christoph Hellwig April 15, 2018, 2:59 p.m. UTC

swiotlb now selects the DMA_DIRECT_OPS config symbol, so this will
always be true.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 lib/swiotlb.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 47aeb04c1997..07f260319b82 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		= swiotlb_dma_supported,
 };
-#endif /* CONFIG_DMA_DIRECT_OPS */

[12/12] swiotlb: remove the CONFIG_DMA_DIRECT_OPS ifdefs

Commit Message

Patch