From 768c87ccb9bc82d772bdcf3f6a87fe878de84db9 Mon Sep 17 00:00:00 2001 From: xxm Date: Fri, 8 Aug 2014 11:00:38 +0800 Subject: [PATCH] rk: ion: update iovmm_map to rockchip_iovmm_map --- drivers/staging/android/ion/ion_cma_heap.c | 8 ++++---- drivers/staging/android/ion/ion_system_heap.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/android/ion/ion_cma_heap.c b/drivers/staging/android/ion/ion_cma_heap.c index f6b8789312ed..8e5529262f5d 100755 --- a/drivers/staging/android/ion/ion_cma_heap.c +++ b/drivers/staging/android/ion/ion_cma_heap.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "ion.h" #include "ion_priv.h" @@ -204,11 +204,11 @@ static int ion_cma_map_iommu(struct ion_buffer *buffer, int ret = 0; struct ion_cma_buffer_info *info = buffer->priv_virt; - data->iova_addr = iovmm_map(iommu_dev, info->table->sgl, 0, iova_length); + data->iova_addr = rockchip_iovmm_map(iommu_dev, info->table->sgl, 0, iova_length); pr_debug("%s: map %x -> %lx\n", __func__, info->table->sgl->dma_address, data->iova_addr); if (!data->iova_addr || IS_ERR_VALUE(data->iova_addr)) { - pr_err("%s: iovmm_map() failed: %lx\n", __func__, data->iova_addr); + pr_err("%s: rockchip_iovmm_map() failed: %lx\n", __func__, data->iova_addr); ret = -EINVAL; goto out; } @@ -222,7 +222,7 @@ out: void ion_cma_unmap_iommu(struct device *iommu_dev, struct ion_iommu_map *data) { pr_debug("%s: unmap %x@%lx\n", __func__, data->mapped_size, data->iova_addr); - iovmm_unmap(iommu_dev, data->iova_addr); + rockchip_iovmm_unmap(iommu_dev, data->iova_addr); return; } diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c index 09f0f404500b..a8bd939eec19 100755 --- a/drivers/staging/android/ion/ion_system_heap.c +++ b/drivers/staging/android/ion/ion_system_heap.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include "ion.h" #include "ion_priv.h" @@ -260,10 +260,10 @@ static int ion_system_map_iommu(struct ion_buffer *buffer, int ret = 0; struct sg_table *table = (struct sg_table*)buffer->priv_virt; - data->iova_addr = iovmm_map(iommu_dev, table->sgl, 0, iova_length); + data->iova_addr = rockchip_iovmm_map(iommu_dev, table->sgl, 0, iova_length); pr_debug("%s: map %x -> %lx\n", __func__, table->sgl->dma_address, data->iova_addr); if (!data->iova_addr || IS_ERR_VALUE(data->iova_addr)) { - pr_err("%s: iovmm_map() failed: %lx\n", __func__, data->iova_addr); + pr_err("%s: rockchip_iovmm_map() failed: %lx\n", __func__, data->iova_addr); ret = -EINVAL; goto out; } @@ -277,7 +277,7 @@ out: void ion_system_unmap_iommu(struct device *iommu_dev, struct ion_iommu_map *data) { pr_debug("%s: unmap %x@%lx\n", __func__, data->mapped_size, data->iova_addr); - iovmm_unmap(iommu_dev, data->iova_addr); + rockchip_iovmm_unmap(iommu_dev, data->iova_addr); return; } -- 2.34.1