diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-11-21 18:56:25 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-12-06 15:56:38 +0100 |
| commit | d11e3d3d03360cd49497c837490576f793baf746 (patch) | |
| tree | ae98b833e1b5a95e1ae662d4fdbc116bd2e3799f /arch/powerpc/platforms/pseries/vio.c | |
| parent | arm: remove the mapping_error dma_map_ops method (diff) | |
| download | linux-d11e3d3d03360cd49497c837490576f793baf746.tar.xz linux-d11e3d3d03360cd49497c837490576f793baf746.zip | |
powerpc/iommu: remove the mapping_error dma_map_ops method
The powerpc iommu code already returns (~(dma_addr_t)0x0) on mapping
failures, so we can switch over to returning DMA_MAPPING_ERROR 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>
Diffstat (limited to '')
| -rw-r--r-- | arch/powerpc/platforms/pseries/vio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pseries/vio.c b/arch/powerpc/platforms/pseries/vio.c index 88f1ad1d6309..a29ad7db918a 100644 --- a/arch/powerpc/platforms/pseries/vio.c +++ b/arch/powerpc/platforms/pseries/vio.c @@ -519,7 +519,7 @@ static dma_addr_t vio_dma_iommu_map_page(struct device *dev, struct page *page, { struct vio_dev *viodev = to_vio_dev(dev); struct iommu_table *tbl; - dma_addr_t ret = IOMMU_MAPPING_ERROR; + dma_addr_t ret = DMA_MAPPING_ERROR; tbl = get_iommu_table_base(dev); if (vio_cmo_alloc(viodev, roundup(size, IOMMU_PAGE_SIZE(tbl)))) { @@ -625,7 +625,6 @@ static const struct dma_map_ops vio_dma_mapping_ops = { .unmap_page = vio_dma_iommu_unmap_page, .dma_supported = vio_dma_iommu_dma_supported, .get_required_mask = vio_dma_get_required_mask, - .mapping_error = dma_iommu_mapping_error, }; /** |