diff options
author | Gustavo Padovan | 2016-02-03 14:25:31 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2016-02-08 02:34:58 +0100 |
commit | e1786348e4e5442e82b4b35f8ade6f4d0f434e18 (patch) | |
tree | afcb2a076995c01cfc88f996bba905fcabe08a88 /drivers/staging/android/uapi/sync.h | |
parent | staging/android: remove SYNC_WAIT ioctl (diff) | |
download | kernel-qcow2-linux-e1786348e4e5442e82b4b35f8ade6f4d0f434e18.tar.gz kernel-qcow2-linux-e1786348e4e5442e82b4b35f8ade6f4d0f434e18.tar.xz kernel-qcow2-linux-e1786348e4e5442e82b4b35f8ade6f4d0f434e18.zip |
staging/android: rename sync_pt_info to sync_fence_info
As struct sync_pt doesn't exist anymore it is a good idea remove any
reference to it in the sync_framework. sync_pts were replaced directly by
fences and here we rename it to sync_fence_info to let the fence namespace
clean.
v2: rename fence_info to sync_fence_info (Maarten)
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android/uapi/sync.h')
-rw-r--r-- | drivers/staging/android/uapi/sync.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/android/uapi/sync.h b/drivers/staging/android/uapi/sync.h index 6c88c8080d1e..9a0c3cd2ced0 100644 --- a/drivers/staging/android/uapi/sync.h +++ b/drivers/staging/android/uapi/sync.h @@ -27,15 +27,15 @@ struct sync_merge_data { }; /** - * struct sync_pt_info - detailed sync_pt information - * @len: length of sync_pt_info including any driver_data + * struct sync_fence_info - detailed fence information + * @len: length of sync_fence_info including any driver_data * @obj_name: name of parent sync_timeline * @driver_name: name of driver implementing the parent - * @status: status of the sync_pt 0:active 1:signaled <0:error + * @status: status of the fence 0:active 1:signaled <0:error * @timestamp_ns: timestamp of status change in nanoseconds * @driver_data: any driver dependent data */ -struct sync_pt_info { +struct sync_fence_info { __u32 len; char obj_name[32]; char driver_name[32]; @@ -52,14 +52,14 @@ struct sync_pt_info { * userspace including pt_info. * @name: name of fence * @status: status of fence. 1: signaled 0:active <0:error - * @pt_info: a sync_pt_info struct for every sync_pt in the fence + * @sync_fence_info: array of sync_fence_info for every fence in the sync_file */ struct sync_file_info_data { __u32 len; char name[32]; __s32 status; - __u8 pt_info[0]; + __u8 sync_fence_info[0]; }; #define SYNC_IOC_MAGIC '>' |