From c2d9466e08b36b707e6d573523e81eca8b4467dd Mon Sep 17 00:00:00 2001 From: Mitchel Humpherys Date: Tue, 30 Jun 2015 16:12:38 -0700 Subject: [PATCH] arm64: dma-mapping: remove order parameter from arm_iommu_create_mapping() arm32 recently removed the `order' parameter from arm_iommu_create_mapping: (68efd7d2fb32c: arm: dma-mapping: remove order parameter from arm_iommu_create_mapping()) in order to make the API easier to understand. The arm32 DMA IOMMU mapper has dynamic resizing of the iova bitmap, so there was no reason to keep the `order' parameter around (which was introduced to reduce the size of the bitmap). Although we don't have dynamic iova bitmap reallocation on arm64, we'd still like to get rid of the `order' parameter since it's confusing and doesn't really help much (especially since all known clients on our system are passing order=0). Remove it. Change-Id: I35e32fdfbe05ec434f64a3a316d13c8f43304bc6 Signed-off-by: Mitchel Humpherys [cip@codeaurora.org: Removed changes unrelated to display] Signed-off-by: Clarence Ip --- drivers/video/fbdev/msm/mdss_smmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/msm/mdss_smmu.c b/drivers/video/fbdev/msm/mdss_smmu.c index 1423e426593f..2efbbb84f82e 100644 --- a/drivers/video/fbdev/msm/mdss_smmu.c +++ b/drivers/video/fbdev/msm/mdss_smmu.c @@ -497,7 +497,7 @@ int mdss_smmu_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct mdss_data_type *mdata = mdss_mdp_get_mdata(); struct mdss_smmu_client *mdss_smmu; - int order = 0, rc = 0; + int rc = 0; u32 domain; size_t va_start, va_size; const struct of_device_id *match; @@ -575,7 +575,7 @@ int mdss_smmu_probe(struct platform_device *pdev) } mdss_smmu->mmu_mapping = arm_iommu_create_mapping( - &platform_bus_type, va_start, va_size, order); + &platform_bus_type, va_start, va_size); if (IS_ERR(mdss_smmu->mmu_mapping)) { pr_err("iommu create mapping failed for domain[%d]\n", domain); rc = PTR_ERR(mdss_smmu->mmu_mapping);