ion: change ion_user_handle_t definition to int

Turn ion_user_handle_t to int. This change reflects the underlying type
returned by the ion driver.

Signed-off-by: Rom Lemarchand <romlem@google.com>
[jstultz: modified patch to apply to staging directory]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index e2a303398dd082cae574a0e1d1a8edcab8ea6f01..1c40b74bc9a3655effe84f516b25a70bc3c686e1 100644 (file)
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -1139,7 +1139,7 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                if (IS_ERR(handle))
                        return PTR_ERR(handle);
 
-               data.handle = (ion_user_handle_t)handle->id;
+               data.handle = handle->id;
 
                if (copy_to_user((void __user *)arg, &data, sizeof(data))) {
                        ion_free(client, handle);
@@ -1156,7 +1156,7 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                                   sizeof(struct ion_handle_data)))
                        return -EFAULT;
                mutex_lock(&client->lock);
-               handle = ion_uhandle_get(client, (int)data.handle);
+               handle = ion_uhandle_get(client, data.handle);
                mutex_unlock(&client->lock);
                if (!handle)
                        return -EINVAL;
@@ -1171,7 +1171,7 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 
                if (copy_from_user(&data, (void __user *)arg, sizeof(data)))
                        return -EFAULT;
-               handle = ion_uhandle_get(client, (int)data.handle);
+               handle = ion_uhandle_get(client, data.handle);
                data.fd = ion_share_dma_buf_fd(client, handle);
                if (copy_to_user((void __user *)arg, &data, sizeof(data)))
                        return -EFAULT;
@@ -1191,7 +1191,7 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                if (IS_ERR(handle))
                        ret = PTR_ERR(handle);
                else
-                       data.handle = (ion_user_handle_t)handle->id;
+                       data.handle = handle->id;
 
                if (copy_to_user((void __user *)arg, &data,
                                 sizeof(struct ion_fd_data)))

diff --git a/drivers/staging/android/ion/ion.h b/drivers/staging/android/ion/ion.h
index 244f085b5895da6a2c9bcac43cd7f54e8a4643a3..d9798909f809c6f90c9f2dfc865955287bfe3d62 100644 (file)
--- a/drivers/staging/android/ion/ion.h
+++ b/drivers/staging/android/ion/ion.h
@@ -19,8 +19,7 @@
 
 #include <linux/types.h>
 
-struct ion_handle;
-typedef struct ion_handle *ion_user_handle_t;
+typedef int ion_user_handle_t;
 
 /**
  * enum ion_heap_types - list of all possible types of heaps
@@ -65,6 +64,7 @@ enum ion_heap_type {
                                           caches must be managed manually */
 
 #ifdef __KERNEL__
+struct ion_handle;
 struct ion_device;
 struct ion_heap;
 struct ion_mapper;