staging: android: binder: replace types with portable ones

Since this driver is meant to be used on different types of processors
and a portable driver should specify the size a variable expects to be
this patch changes the types used throughout the binder interface.

We use "userspace" types since this header will be exported and used by
the Android filesystem.

The patch does not change in any way the functionality of the binder driver.

Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Acked-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/binder.h b/drivers/staging/android/binder.h
index b55bba9ad92b14eefca777605f91f5af6c2d948d..dadfce028c533374bb46fdb78bdc0c6513cf745e 100644 (file)
--- a/drivers/staging/android/binder.h
+++ b/drivers/staging/android/binder.h
@@ -123,10 +123,10 @@ struct binder_transaction_data {
                void    *ptr;   /* target descriptor of return transaction */
        } target;
        void            *cookie;        /* target object cookie */
-       unsigned int    code;           /* transaction command */
+       __u32           code;           /* transaction command */
 
        /* General information about the transaction. */
-       unsigned int    flags;
+       __u32           flags;
        pid_t           sender_pid;
        uid_t           sender_euid;
        size_t          data_size;      /* number of bytes of data */
@@ -143,7 +143,7 @@ struct binder_transaction_data {
                        /* offsets from buffer to flat_binder_object structs */
                        const void __user       *offsets;
                } ptr;
-               uint8_t buf[8];
+               __u8    buf[8];
        } data;
 };
 
@@ -153,18 +153,18 @@ struct binder_ptr_cookie {
 };
 
 struct binder_pri_desc {
-       int priority;
-       int desc;
+       __s32 priority;
+       __s32 desc;
 };
 
 struct binder_pri_ptr_cookie {
-       int priority;
+       __s32 priority;
        void *ptr;
        void *cookie;
 };
 
 enum binder_driver_return_protocol {
-       BR_ERROR = _IOR('r', 0, int),
+       BR_ERROR = _IOR('r', 0, __s32),
        /*
         * int: error code
         */
@@ -178,7 +178,7 @@ enum binder_driver_return_protocol {
         * binder_transaction_data: the received command.
         */
 
-       BR_ACQUIRE_RESULT = _IOR('r', 4, int),
+       BR_ACQUIRE_RESULT = _IOR('r', 4, __s32),
        /*
         * not currently supported
         * int: 0 if the last bcATTEMPT_ACQUIRE was not successful.
@@ -258,7 +258,7 @@ enum binder_driver_command_protocol {
         * binder_transaction_data: the sent command.
         */
 
-       BC_ACQUIRE_RESULT = _IOW('c', 2, int),
+       BC_ACQUIRE_RESULT = _IOW('c', 2, __s32),
        /*
         * not currently supported
         * int:  0 if the last BR_ATTEMPT_ACQUIRE was not successful.
@@ -270,10 +270,10 @@ enum binder_driver_command_protocol {
         * void *: ptr to transaction data received on a read
         */
 
-       BC_INCREFS = _IOW('c', 4, int),
-       BC_ACQUIRE = _IOW('c', 5, int),
-       BC_RELEASE = _IOW('c', 6, int),
-       BC_DECREFS = _IOW('c', 7, int),
+       BC_INCREFS = _IOW('c', 4, __u32),
+       BC_ACQUIRE = _IOW('c', 5, __u32),
+       BC_RELEASE = _IOW('c', 6, __u32),
+       BC_DECREFS = _IOW('c', 7, __u32),
        /*
         * int: descriptor
         */