Merge tag 'dma-mapping-4.21' of git://git.infradead.org/users/hch/dma-mapping

[linux-2.6-microblaze.git] / arch / powerpc / kernel / dma-swiotlb.c

diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c
index 678811a..7d5fc97 100644 (file)
--- a/arch/powerpc/kernel/dma-swiotlb.c
+++ b/arch/powerpc/kernel/dma-swiotlb.c
@@ -50,16 +50,15 @@ const struct dma_map_ops powerpc_swiotlb_dma_ops = {
        .alloc = __dma_nommu_alloc_coherent,
        .free = __dma_nommu_free_coherent,
        .mmap = dma_nommu_mmap_coherent,
-       .map_sg = swiotlb_map_sg_attrs,
-       .unmap_sg = swiotlb_unmap_sg_attrs,
+       .map_sg = dma_direct_map_sg,
+       .unmap_sg = dma_direct_unmap_sg,
        .dma_supported = swiotlb_dma_supported,
-       .map_page = swiotlb_map_page,
-       .unmap_page = swiotlb_unmap_page,
-       .sync_single_for_cpu = swiotlb_sync_single_for_cpu,
-       .sync_single_for_device = swiotlb_sync_single_for_device,
-       .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
-       .sync_sg_for_device = swiotlb_sync_sg_for_device,
-       .mapping_error = dma_direct_mapping_error,
+       .map_page = dma_direct_map_page,
+       .unmap_page = dma_direct_unmap_page,
+       .sync_single_for_cpu = dma_direct_sync_single_for_cpu,
+       .sync_single_for_device = dma_direct_sync_single_for_device,
+       .sync_sg_for_cpu = dma_direct_sync_sg_for_cpu,
+       .sync_sg_for_device = dma_direct_sync_sg_for_device,
        .get_required_mask = swiotlb_powerpc_get_required,
 };