diff options
| author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2016-02-03 11:25:34 -0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-07 17:34:58 -0800 |
| commit | 323de43f79c5055af71c2db44f34e060ac15e1df (patch) | |
| tree | 3f90659c318ac943bfd9701e7952b0ce52e8f697 /drivers/staging | |
| parent | c7434b8436f9fb79855f0a52e4e9665becb77aea (diff) | |
| download | op-kernel-dev-323de43f79c5055af71c2db44f34e060ac15e1df.zip op-kernel-dev-323de43f79c5055af71c2db44f34e060ac15e1df.tar.gz | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/android/sync.c | 4 | ||||
| -rw-r--r-- | drivers/staging/android/uapi/sync.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index d527878..2ab0c20 100644 --- 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 4d8cf00..a0cf357 100644 --- 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; |
