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 0271c19ced2c15aafaab27b3d234d9990efdb7ac..44178ca69a7522329a96acf0592fabb1a9bfdf84 100755 (executable)
--- 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 67bf9d322d46cae973efb655d244b71a6a52abc3..509d768da956c7937121ed7ee896c9de46bce57c 100644 (file)
--- 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));