Android: Fix up warnings introduced by 32 on 64 bit support

Mostly type mismatches in printf() specifiers together with a missing
conversion of the trace header to use userptr32_t.

Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index 87f1e1ca8dc5e6068eedf1a4a1ac2c0282bbe2f5..578e670ff5374b4e635cada6e9c96f4f321756d8 100644 (file)
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -1273,7 +1273,7 @@ static void binder_transaction_buffer_release(struct binder_proc *proc,
                case BINDER_TYPE_WEAK_HANDLE: {
                        struct binder_ref *ref = binder_get_ref(proc, fp->handle);
                        if (ref == NULL) {
-                               pr_err("transaction release %d bad handle %ld\n",
+                               pr_err("transaction release %d bad handle %d\n",
                                 debug_id, fp->handle);
                                break;
                        }
@@ -1285,13 +1285,13 @@ static void binder_transaction_buffer_release(struct binder_proc *proc,
 
                case BINDER_TYPE_FD:
                        binder_debug(BINDER_DEBUG_TRANSACTION,
-                                    "        fd %ld\n", fp->handle);
+                                    "        fd %d\n", fp->handle);
                        if (failed_at)
                                task_close_fd(proc, fp->handle);
                        break;
 
                default:
-                       pr_err("transaction release %d bad object type %lx\n",
+                       pr_err("transaction release %d bad object type %x\n",
                                debug_id, fp->type);
                        break;
                }
@@ -1558,7 +1558,7 @@ static void binder_transaction(struct binder_proc *proc,
                case BINDER_TYPE_WEAK_HANDLE: {
                        struct binder_ref *ref = binder_get_ref(proc, fp->handle);
                        if (ref == NULL) {
-                               binder_user_error("%d:%d got transaction with invalid handle, %ld\n",
+                               binder_user_error("%d:%d got transaction with invalid handle, %d\n",
                                                proc->pid,
                                                thread->pid, fp->handle);
                                return_error = BR_FAILED_REPLY;
@@ -1605,13 +1605,13 @@ static void binder_transaction(struct binder_proc *proc,
 
                        if (reply) {
                                if (!(in_reply_to->flags & TF_ACCEPT_FDS)) {
-                                       binder_user_error("%d:%d got reply with fd, %ld, but target does not allow fds\n",
+                                       binder_user_error("%d:%d got reply with fd, %d, but target does not allow fds\n",
                                                proc->pid, thread->pid, fp->handle);
                                        return_error = BR_FAILED_REPLY;
                                        goto err_fd_not_allowed;
                                }
                        } else if (!target_node->accept_fds) {
-                               binder_user_error("%d:%d got transaction with fd, %ld, but target does not allow fds\n",
+                               binder_user_error("%d:%d got transaction with fd, %d, but target does not allow fds\n",
                                        proc->pid, thread->pid, fp->handle);
                                return_error = BR_FAILED_REPLY;
                                goto err_fd_not_allowed;
@@ -1619,7 +1619,7 @@ static void binder_transaction(struct binder_proc *proc,
 
                        file = fget(fp->handle);
                        if (file == NULL) {
-                               binder_user_error("%d:%d got transaction with invalid fd, %ld\n",
+                               binder_user_error("%d:%d got transaction with invalid fd, %d\n",
                                        proc->pid, thread->pid, fp->handle);
                                return_error = BR_FAILED_REPLY;
                                goto err_fget_failed;
@@ -1638,13 +1638,13 @@ static void binder_transaction(struct binder_proc *proc,
                        task_fd_install(target_proc, target_fd, file);
                        trace_binder_transaction_fd(t, fp->handle, target_fd);
                        binder_debug(BINDER_DEBUG_TRANSACTION,
-                                    "        fd %ld -> %d\n", fp->handle, target_fd);
+                                    "        fd %d -> %d\n", fp->handle, target_fd);
                        /* TODO: fput? */
                        fp->handle = target_fd;
                } break;
 
                default:
-                       binder_user_error("%d:%d got transaction with invalid object type, %lx\n",
+                       binder_user_error("%d:%d got transaction with invalid object type, %x\n",
                                proc->pid, thread->pid, fp->type);
                        return_error = BR_FAILED_REPLY;
                        goto err_bad_object_type;
@@ -2454,7 +2454,7 @@ static void binder_release_work(struct list_head *list)
 
                        death = container_of(w, struct binder_ref_death, work);
                        binder_debug(BINDER_DEBUG_DEAD_TRANSACTION,
-                               "undelivered death notification, %p\n",
+                               "undelivered death notification, %x\n",
                                death->cookie);
                        kfree(death);
                        binder_stats_deleted(BINDER_STAT_DEATH);

diff --git a/drivers/staging/android/binder_trace.h b/drivers/staging/android/binder_trace.h
index c661e376398fff129c5411482d9743248c8e9b44..23fa45369a30384d0b3cbbb2ca5b8befe00de78f 100644 (file)
--- a/drivers/staging/android/binder_trace.h
+++ b/drivers/staging/android/binder_trace.h
@@ -152,18 +152,18 @@ TRACE_EVENT(binder_transaction_node_to_ref,
        TP_STRUCT__entry(
                __field(int, debug_id)
                __field(int, node_debug_id)
-               __field(void __user *, node_ptr)
+               __field(userptr32_t, node_ptr)
                __field(int, ref_debug_id)
                __field(uint32_t, ref_desc)
        ),
        TP_fast_assign(
                __entry->debug_id = t->debug_id;
                __entry->node_debug_id = node->debug_id;
-               __entry->node_ptr = (void __user *)node->ptr;
+               __entry->node_ptr = node->ptr;
                __entry->ref_debug_id = ref->debug_id;
                __entry->ref_desc = ref->desc;
        ),
-       TP_printk("transaction=%d node=%d src_ptr=0x%p ==> dest_ref=%d dest_desc=%d",
+       TP_printk("transaction=%d node=%d src_ptr=0x%x ==> dest_ref=%d dest_desc=%d",
                  __entry->debug_id, __entry->node_debug_id, __entry->node_ptr,
                  __entry->ref_debug_id, __entry->ref_desc)
 );
@@ -177,16 +177,16 @@ TRACE_EVENT(binder_transaction_ref_to_node,
                __field(int, ref_debug_id)
                __field(uint32_t, ref_desc)
                __field(int, node_debug_id)
-               __field(void __user *, node_ptr)
+               __field(userptr32_t, node_ptr)
        ),
        TP_fast_assign(
                __entry->debug_id = t->debug_id;
                __entry->ref_debug_id = ref->debug_id;
                __entry->ref_desc = ref->desc;
                __entry->node_debug_id = ref->node->debug_id;
-               __entry->node_ptr = (void __user *)ref->node->ptr;
+               __entry->node_ptr = ref->node->ptr;
        ),
-       TP_printk("transaction=%d node=%d src_ref=%d src_desc=%d ==> dest_ptr=0x%p",
+       TP_printk("transaction=%d node=%d src_ref=%d src_desc=%d ==> dest_ptr=0x%x",
                  __entry->debug_id, __entry->node_debug_id,
                  __entry->ref_debug_id, __entry->ref_desc, __entry->node_ptr)
 );