diff options
| author |   Christoph Hellwig <hch@lst.de> | 2018-11-21 19:18:10 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-12-06 06:56:44 -0800 |
| commit | 608b9761a06089ac22bb157bc70d16e9df12ca7c (patch) | |
| tree | 286052f7a2bb6190b77d3c3a6ac18859fd8d1c37 | |
| parent | ia64/sba_iommu: remove the mapping_error dma_map_ops method (diff) | |
| download | linux-dev-608b9761a06089ac22bb157bc70d16e9df12ca7c.tar.xz linux-dev-608b9761a06089ac22bb157bc70d16e9df12ca7c.zip | |
ia64/sn: remove the mapping_error dma_map_ops method
Return DMA_MAPPING_ERROR instead of 0 on a dma mapping failure and let
the core dma-mapping code handle the rest.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/ia64/sn/pci/pci_dma.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/ia64/sn/pci/pci_dma.c b/arch/ia64/sn/pci/pci_dma.c index 4ce4ee4ef9f2..b7d42e4edc1f 100644 --- a/arch/ia64/sn/pci/pci_dma.c +++ b/arch/ia64/sn/pci/pci_dma.c @@ -196,7 +196,7 @@ static dma_addr_t sn_dma_map_page(struct device *dev, struct page *page, if (!dma_addr) { printk(KERN_ERR "%s: out of ATEs\n", __func__); - return 0; + return DMA_MAPPING_ERROR; } return dma_addr; } @@ -314,11 +314,6 @@ static int sn_dma_map_sg(struct device *dev, struct scatterlist *sgl, return nhwentries; } -static int sn_dma_mapping_error(struct device *dev, dma_addr_t dma_addr) -{ - return 0; -} - static u64 sn_dma_get_required_mask(struct device *dev) { return DMA_BIT_MASK(64); @@ -441,7 +436,6 @@ static struct dma_map_ops sn_dma_ops = { .unmap_page = sn_dma_unmap_page, .map_sg = sn_dma_map_sg, .unmap_sg = sn_dma_unmap_sg, - .mapping_error = sn_dma_mapping_error, .dma_supported = sn_dma_supported, .get_required_mask = sn_dma_get_required_mask, }; |