Revert "staging: android: binder: Fix build warnings"

This reverts commit aecff9d0c1a87b5cd9af1c91b79a3d8fba82ffba.

Changes to the binder code makes this obsolete, and this now causes
the following warnings:

drivers/staging/android/./binder_trace.h:162:21: error: assignment makes integer from pointer without a cast [-Werror]
   __entry->node_ptr = (void __user *)node->ptr;

drivers/staging/android/./binder_trace.h: In function ‘ftrace_raw_event_binder_transaction_ref_to_node’:
drivers/staging/android/./binder_trace.h:188:21: error: assignment makes integer from pointer without a cast [-Werror]
   __entry->node_ptr = (void __user *)ref->node->ptr;

Reported-by: Sherman Yin <syin@broadcom.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>

diff --git a/drivers/staging/android/binder_trace.h b/drivers/staging/android/binder_trace.h
index 02add80b62a0f7644d1892bbfbeec2f992a85bce..7f20f3dc83690cad36cfa82c2a946384a8c30bb8 100644 (file)
--- a/drivers/staging/android/binder_trace.h
+++ b/drivers/staging/android/binder_trace.h
@@ -159,7 +159,7 @@ TRACE_EVENT(binder_transaction_node_to_ref,
        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;
        ),
@@ -185,7 +185,7 @@ TRACE_EVENT(binder_transaction_ref_to_node,
                __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%016llx",
                  __entry->debug_id, __entry->node_debug_id,