staging/android: remove len field from struct sync_fence_info

After removing driver_data struct sync_fence_info has now a fixed size,
thus it doesn't need any field to tell its size, it is already known.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index d527878c74889028d26f70dd3502732c510ea91f..2ab0c208088de6bd2cd973c5fd1d798f8884fa2b 100644 (file)
--- a/drivers/staging/android/sync.c
+++ b/drivers/staging/android/sync.c
@@ -486,8 +486,6 @@ static int sync_fill_fence_info(struct fence *fence, void *data, int size)
        if (size < sizeof(*info))
                return -ENOMEM;
 
-       info->len = sizeof(*info);
-
        strlcpy(info->obj_name, fence->ops->get_timeline_name(fence),
                sizeof(info->obj_name));
        strlcpy(info->driver_name, fence->ops->get_driver_name(fence),
@@ -498,7 +496,7 @@ static int sync_fill_fence_info(struct fence *fence, void *data, int size)
                info->status = 0;
        info->timestamp_ns = ktime_to_ns(fence->timestamp);
 
-       return info->len;
+       return sizeof(*info);
 }
 
 static long sync_file_ioctl_fence_info(struct sync_file *sync_file,

diff --git a/drivers/staging/android/uapi/sync.h b/drivers/staging/android/uapi/sync.h
index 4d8cf0062f04ec32567d78c9bf66f20661ab7b9b..a0cf357e598da43b4e6e8512ac18fe552c611928 100644 (file)
--- a/drivers/staging/android/uapi/sync.h
+++ b/drivers/staging/android/uapi/sync.h
@@ -28,14 +28,12 @@ struct sync_merge_data {
 
 /**
  * struct sync_fence_info - detailed fence information
- * @len:               length of sync_fence_info
  * @obj_name:          name of parent sync_timeline
  * @driver_name:       name of driver implementing the parent
  * @status:            status of the fence 0:active 1:signaled <0:error
  * @timestamp_ns:      timestamp of status change in nanoseconds
  */
 struct sync_fence_info {
-       __u32   len;
        char    obj_name[32];
        char    driver_name[32];
        __s32   status;