summaryrefslogtreecommitdiffstats
path: root/drivers/staging/android/uapi/sync.h
diff options
context:
space:
mode:
authorGustavo Padovan2016-02-03 14:25:32 +0100
committerGreg Kroah-Hartman2016-02-08 02:34:58 +0100
commitb5b24ac57af99b6b580eb52118167702e442da02 (patch)
treedfe65483c1e23e406d4167a8bdb95b4cca3802c4 /drivers/staging/android/uapi/sync.h
parentstaging/android: rename sync_pt_info to sync_fence_info (diff)
downloadkernel-qcow2-linux-b5b24ac57af99b6b580eb52118167702e442da02.tar.gz
kernel-qcow2-linux-b5b24ac57af99b6b580eb52118167702e442da02.tar.xz
kernel-qcow2-linux-b5b24ac57af99b6b580eb52118167702e442da02.zip
staging/android: rename sync_file_info_data to sync_file_info
info_data is a bit redundant, let's keep it as only sync_file_info. It is also smaller. 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.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/android/uapi/sync.h b/drivers/staging/android/uapi/sync.h
index 9a0c3cd2ced0..fcc0b3c5b6da 100644
--- a/drivers/staging/android/uapi/sync.h
+++ b/drivers/staging/android/uapi/sync.h
@@ -46,15 +46,15 @@ struct sync_fence_info {
};
/**
- * struct sync_file_info_data - data returned from fence info ioctl
+ * struct sync_file_info - data returned from fence info ioctl
* @len: ioctl caller writes the size of the buffer its passing in.
- * ioctl returns length of sync_file_info_data returned to
+ * ioctl returns length of sync_file_info returned to
* userspace including pt_info.
* @name: name of fence
* @status: status of fence. 1: signaled 0:active <0:error
* @sync_fence_info: array of sync_fence_info for every fence in the sync_file
*/
-struct sync_file_info_data {
+struct sync_file_info {
__u32 len;
char name[32];
__s32 status;
@@ -84,7 +84,6 @@ struct sync_file_info_data {
* pt_info is a buffer containing sync_pt_infos for every sync_pt in the fence.
* To iterate over the sync_pt_infos, use the sync_pt_info.len field.
*/
-#define SYNC_IOC_FENCE_INFO _IOWR(SYNC_IOC_MAGIC, 2,\
- struct sync_file_info_data)
+#define SYNC_IOC_FENCE_INFO _IOWR(SYNC_IOC_MAGIC, 2, struct sync_file_info)
#endif /* _UAPI_LINUX_SYNC_H */