redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

ion: fix printk warnings

Browse source 
Use %z for size_t and %pa for dma_addr_t to avoid warnings in printks.

Signed-off-by: Colin Cross <ccross@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Colin Cross 2013-12-13 19:26:14 -08:00 committed by Greg Kroah-Hartman
parent 1d804535c3
commit e61fc915fa
4 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/staging/android/ion/ion.c
View file

@ -471,7 +471,7 @@ struct ion_handle *ion_alloc(struct ion_client *client, size_t len,
struct ion_heap *heap; struct ion_heap *heap;
int ret; int ret;
pr_debug("%s: len %d align %d heap_id_mask %u flags %x\n", __func__, pr_debug("%s: len %zu align %zu heap_id_mask %u flags %x\n", __func__,
len, align, heap_id_mask, flags); len, align, heap_id_mask, flags);
/* /*
* traverse the list of heaps available in this system in priority * traverse the list of heaps available in this system in priority
@ -688,7 +688,7 @@ static int ion_debug_client_show(struct seq_file *s, void *unused)
for (i = 0; i < ION_NUM_HEAP_IDS; i++) { for (i = 0; i < ION_NUM_HEAP_IDS; i++) {
if (!names[i]) if (!names[i])
continue; continue;
seq_printf(s, "%16.16s: %16u\n", names[i], sizes[i]); seq_printf(s, "%16.16s: %16zu\n", names[i], sizes[i]);
} }
return 0; return 0;
} }
@ -1336,10 +1336,10 @@ static int ion_debug_heap_show(struct seq_file *s, void *unused)
char task_comm[TASK_COMM_LEN]; char task_comm[TASK_COMM_LEN];
get_task_comm(task_comm, client->task); get_task_comm(task_comm, client->task);
seq_printf(s, "%16.s %16u %16u\n", task_comm, seq_printf(s, "%16.s %16u %16zu\n", task_comm,
client->pid, size); client->pid, size);
} else { } else {
seq_printf(s, "%16.s %16u %16u\n", client->name, seq_printf(s, "%16.s %16u %16zu\n", client->name,
client->pid, size); client->pid, size);
} }
} }
@ -1354,19 +1354,20 @@ static int ion_debug_heap_show(struct seq_file *s, void *unused)
continue; continue;
total_size += buffer->size; total_size += buffer->size;
if (!buffer->handle_count) { if (!buffer->handle_count) {
seq_printf(s, "%16.s %16u %16u %d %d\n", buffer->task_comm, seq_printf(s, "%16.s %16u %16zu %d %d\n",
buffer->pid, buffer->size, buffer->kmap_cnt, buffer->task_comm, buffer->pid,
buffer->size, buffer->kmap_cnt,
atomic_read(&buffer->ref.refcount)); atomic_read(&buffer->ref.refcount));
total_orphaned_size += buffer->size; total_orphaned_size += buffer->size;
} }
} }
mutex_unlock(&dev->buffer_lock); mutex_unlock(&dev->buffer_lock);
seq_printf(s, "----------------------------------------------------\n"); seq_printf(s, "----------------------------------------------------\n");
seq_printf(s, "%16.s %16u\n", "total orphaned", seq_printf(s, "%16.s %16zu\n", "total orphaned",
total_orphaned_size); total_orphaned_size);
seq_printf(s, "%16.s %16u\n", "total ", total_size); seq_printf(s, "%16.s %16zu\n", "total ", total_size);
if (heap->flags & ION_HEAP_FLAG_DEFER_FREE) if (heap->flags & ION_HEAP_FLAG_DEFER_FREE)
seq_printf(s, "%16.s %16u\n", "deferred free", seq_printf(s, "%16.s %16zu\n", "deferred free",
heap->free_list_size); heap->free_list_size);
seq_printf(s, "----------------------------------------------------\n"); seq_printf(s, "----------------------------------------------------\n");
@ -1522,11 +1523,11 @@ void __init ion_reserve(struct ion_platform_data *data)
int ret = memblock_reserve(data->heaps[i].base, int ret = memblock_reserve(data->heaps[i].base,
data->heaps[i].size); data->heaps[i].size);
if (ret) if (ret)
pr_err("memblock reserve of %x@%lx failed\n", pr_err("memblock reserve of %zx@%lx failed\n",
data->heaps[i].size, data->heaps[i].size,
data->heaps[i].base); data->heaps[i].base);
} }
pr_info("%s: %s reserved base %lx size %d\n", __func__, pr_info("%s: %s reserved base %lx size %zu\n", __func__,
data->heaps[i].name, data->heaps[i].name,
data->heaps[i].base, data->heaps[i].base,
data->heaps[i].size); data->heaps[i].size);

2
drivers/staging/android/ion/ion_chunk_heap.c
View file

@ -186,7 +186,7 @@ struct ion_heap *ion_chunk_heap_create(struct ion_platform_heap *heap_data)
chunk_heap->heap.ops = &chunk_heap_ops; chunk_heap->heap.ops = &chunk_heap_ops;
chunk_heap->heap.type = ION_HEAP_TYPE_CHUNK; chunk_heap->heap.type = ION_HEAP_TYPE_CHUNK;
chunk_heap->heap.flags = ION_HEAP_FLAG_DEFER_FREE; chunk_heap->heap.flags = ION_HEAP_FLAG_DEFER_FREE;
pr_info("%s: base %lu size %u align %ld\n", __func__, chunk_heap->base, pr_info("%s: base %lu size %zu align %ld\n", __func__, chunk_heap->base,
heap_data->size, heap_data->align); heap_data->size, heap_data->align);
return &chunk_heap->heap; return &chunk_heap->heap;

4
drivers/staging/android/ion/ion_cma_heap.c
View file

@ -128,8 +128,8 @@ static int ion_cma_phys(struct ion_heap *heap, struct ion_buffer *buffer,
struct device *dev = cma_heap->dev; struct device *dev = cma_heap->dev;
struct ion_cma_buffer_info *info = buffer->priv_virt; struct ion_cma_buffer_info *info = buffer->priv_virt;
dev_dbg(dev, "Return buffer %p physical address 0x%x\n", buffer, dev_dbg(dev, "Return buffer %p physical address 0x%pa\n", buffer,
info->handle); &info->handle);
*addr = info->handle; *addr = info->handle;
*len = buffer->size; *len = buffer->size;

2
drivers/staging/android/ion/ion_heap.c
View file

@ -281,7 +281,7 @@ struct ion_heap *ion_heap_create(struct ion_platform_heap *heap_data)
} }
if (IS_ERR_OR_NULL(heap)) { if (IS_ERR_OR_NULL(heap)) {
pr_err("%s: error creating heap %s type %d base %lu size %u\n", pr_err("%s: error creating heap %s type %d base %lu size %zu\n",
__func__, heap_data->name, heap_data->type, __func__, heap_data->name, heap_data->type,
heap_data->base, heap_data->size); heap_data->base, heap_data->size);
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);