[PATCH 02/10] staging/android: rename sync_pt_info to fence_info

Gustavo Padovan
2016-01-29T21:20:48Z

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.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
drivers/staging/android/sync.c | 8 ++++----
drivers/staging/android/uapi/sync.h | 12 ++++++------
2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index 381209a..ed63001 100644
--- a/drivers/staging/android/sync.c
+++ b/drivers/staging/android/sync.c
@@ -490,12 +490,12 @@ err_put_fd:
return err;
}

-static int sync_fill_pt_info(struct fence *fence, void *data, int size)
+static int sync_fill_fence_info(struct fence *fence, void *data, int size)
{
- struct sync_pt_info *info = data;
+ struct fence_info *info = data;
int ret;

- if (size < sizeof(struct sync_pt_info))
+ if (size < sizeof(*info))
return -ENOMEM;

info->len = sizeof(struct sync_pt_info);
@@ -553,7 +553,7 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file,
for (i = 0; i < sync_file->num_fences; ++i) {
struct fence *fence = sync_file->cbs[i].fence;

- ret = sync_fill_pt_info(fence, (u8 *)data + len, size - len);
+ ret = sync_fill_fence_info(fence, (u8 *)data + len, size - len);

if (ret < 0)
goto out;
diff --git a/drivers/staging/android/uapi/sync.h b/drivers/staging/android/uapi/sync.h
index 6c88c80..c4703ec 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 fence_info - detailed fence information
+ * @len: length of 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 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
+ * @fence_info: a fence_info struct for every fence in the sync_file
*/
struct sync_file_info_data {
__u32 len;
char name[32];
__s32 status;

- __u8 pt_info[0];
+ __u8 fence_info[0];
};

#define SYNC_IOC_MAGIC '>'
--
2.5.0