Merge "arm: dma-mapping: handle IOVA address zero" (10ff46eb) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm/mm/dma-mapping.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -2132,9 +2132,6 @@ static void arm_coherent_iommu_unmap_page(struct device *dev, dma_addr_t handle,
		int offset = handle & ~PAGE_MASK;
		int len = PAGE_ALIGN(size + offset);

		if (!iova)
		return;

		iommu_unmap(mapping->domain, iova, len);
		__free_iova(mapping, iova, len);
		}
		@@ -2232,9 +2229,6 @@ static void arm_iommu_sync_single_for_cpu(struct device *dev,
		struct page *page = phys_to_page(iommu_iova_to_phys(mapping->domain, iova));
		unsigned int offset = handle & ~PAGE_MASK;

		if (!iova)
		return;

		__dma_page_dev_to_cpu(page, offset, size, dir);
		}

		@@ -2246,9 +2240,6 @@ static void arm_iommu_sync_single_for_device(struct device *dev,
		struct page *page = phys_to_page(iommu_iova_to_phys(mapping->domain, iova));
		unsigned int offset = handle & ~PAGE_MASK;

		if (!iova)
		return;

		__dma_page_cpu_to_dev(page, offset, size, dir);
		}