From: CMY <cmy@rock-chips.com>
Date: Tue, 3 Mar 2015 05:56:52 +0000 (+0800)
Subject: rk: ion: fix compile warnning
X-Git-Tag: firefly_0821_release~4263^2~25^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c4bc04acf050030d6288504f5b96b8e3d3622c6d;p=firefly-linux-kernel-4.4.55.git

rk: ion: fix compile warnning

Signed-off-by: CMY <cmy@rock-chips.com>
(cherry picked from commit ee9707a058c52a0d0c27f5804db9e9e96075d363)

Signed-off-by: CMY <cmy@rock-chips.com>
---

diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 0271c19ced2c..44178ca69a75 100755
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -1360,7 +1360,7 @@ static int ion_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma)
 		pr_err("%s: failure mapping buffer to userspace\n",
 		       __func__);
 
-	trace_ion_buffer_mmap("", (unsigned int)buffer, buffer->size,
+	trace_ion_buffer_mmap("", (void*)buffer, buffer->size,
 		vma->vm_start, vma->vm_end);
 
 	return ret;
@@ -1370,7 +1370,7 @@ int ion_munmap(struct dma_buf *dmabuf, struct vm_area_struct *vma)
 {
 	struct ion_buffer *buffer = dmabuf->priv;
 
-	trace_ion_buffer_munmap("", (unsigned int)buffer, buffer->size,
+	trace_ion_buffer_munmap("", (void*)buffer, buffer->size,
 		vma->vm_start, vma->vm_end);
 
 	return 0;
diff --git a/drivers/staging/android/trace/ion.h b/drivers/staging/android/trace/ion.h
index 67bf9d322d46..509d768da956 100644
--- a/drivers/staging/android/trace/ion.h
+++ b/drivers/staging/android/trace/ion.h
@@ -147,12 +147,12 @@ DEFINE_EVENT(ion_kmap_op, ion_kernel_map,
 	TP_ARGS(client, buffer, size, kaddr));
 
 DECLARE_EVENT_CLASS(ion_mmap_op,
-	TP_PROTO(const char* client, unsigned int buf, unsigned int size,
+	TP_PROTO(const char* client, void* buf, unsigned int size,
 		unsigned long vm_start, unsigned long vm_end),
 	TP_ARGS(client, buf, size, vm_start, vm_end),
 	TP_STRUCT__entry(
 		__string(client, client)
-		__field(unsigned int, buf)
+		__field(void*, buf)
 		__field(unsigned int, size)
 		__field(unsigned long, vm_start)
 		__field(unsigned long, vm_end)
@@ -164,18 +164,18 @@ DECLARE_EVENT_CLASS(ion_mmap_op,
 		__entry->vm_start = vm_start;
 		__entry->vm_end = vm_end;
 	),
-	TP_printk("client=%s,buffer=%08x:%d,vma[%08lx:%08lx]",
+	TP_printk("client=%s,buffer=%p:%d,vma[%08lx:%08lx]",
 		  __get_str(client), __entry->buf, __entry->size,
 		  __entry->vm_start, __entry->vm_end)
 );
 
 DEFINE_EVENT(ion_mmap_op, ion_buffer_mmap,
-	TP_PROTO(const char* client, unsigned int buf, unsigned int size,
+	TP_PROTO(const char* client, void* buf, unsigned int size,
 		unsigned long vm_start, unsigned long vm_end),
 	TP_ARGS(client, buf, size, vm_start, vm_end));
 
 DEFINE_EVENT(ion_mmap_op, ion_buffer_munmap,
-	TP_PROTO(const char* client, unsigned int buf, unsigned int size,
+	TP_PROTO(const char* client, void* buf, unsigned int size,
 		unsigned long vm_start, unsigned long vm_end),
 	TP_ARGS(client, buf, size, vm_start, vm_end));