rk: ion: fix build warning for iommu API
authorCMY <cmy@rock-chips.com>
Tue, 24 Jun 2014 02:48:50 +0000 (10:48 +0800)
committerCMY <cmy@rock-chips.com>
Mon, 7 Jul 2014 02:23:10 +0000 (10:23 +0800)
drivers/staging/android/ion/ion.c
drivers/staging/android/ion/ion_cma_heap.c
drivers/staging/android/ion/ion_system_heap.c

index 48ce5acfe8bf02925db0c9e83960d014e3242a95..8fa98adc517542cdb6feaf288185464d0ddae23a 100755 (executable)
@@ -917,7 +917,7 @@ static int ion_debug_client_show_buffer_map(struct seq_file *s, struct ion_buffe
 
        while (node != NULL) {
                iommu_map = rb_entry(node, struct ion_iommu_map, node);
-               seq_printf(s, "%16.16s:   0x%08lx   0x%08lx %8zuKB %4d\n",
+               seq_printf(s, "%16.16s:   0x%08lx   0x%08x %8zuKB %4d\n",
                        "<iommu>", iommu_map->iova_addr, 0, iommu_map->mapped_size>>10,
                        atomic_read(&iommu_map->ref.refcount));
 
index 2faf8d57208699755b9cd031cd9542d6a5c31f40..e93afd0e7270534b31b42bafdd3a2b7fe8ecb09c 100755 (executable)
@@ -196,7 +196,7 @@ static int ion_cma_map_iommu(struct ion_buffer *buffer,
        struct ion_cma_buffer_info *info = buffer->priv_virt;
 
        data->iova_addr = iovmm_map(iommu_dev, info->table->sgl, 0, iova_length);
-       pr_debug("%s: map %lx -> %lx\n", __func__, info->table->sgl->dma_address,
+       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);
index e61993d3c2c4079cb5e437588cc16cc46e36ed1d..09f0f404500b18ca130af2887b7df181b70f6243 100755 (executable)
@@ -261,7 +261,7 @@ static int ion_system_map_iommu(struct ion_buffer *buffer,
        struct sg_table *table = (struct sg_table*)buffer->priv_virt;
 
        data->iova_addr = iovmm_map(iommu_dev, table->sgl, 0, iova_length);
-       pr_debug("%s: map %lx -> %lx\n", __func__, table->sgl->dma_address, data->iova_addr);
+       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);
                ret = -EINVAL;