From: Gustavo Padovan gustavo.padovan@collabora.co.uk
As we moved value storage to fence_timeline and fence those two structs became useless and can be removed now.
Signed-off-by: Gustavo Padovan gustavo.padovan@collabora.co.uk --- drivers/staging/android/sw_sync.c | 15 ++++++--------- drivers/staging/android/sw_sync.h | 24 ++++++------------------ drivers/staging/android/sync_debug.c | 12 ++++++------ 3 files changed, 18 insertions(+), 33 deletions(-)
diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c index 7250f1b..ee7a942 100644 --- a/drivers/staging/android/sw_sync.c +++ b/drivers/staging/android/sw_sync.c @@ -37,25 +37,22 @@ static const struct fence_ops sw_sync_fence_ops = { .timeline_value_str = fence_default_timeline_value_str, };
-struct fence *sw_sync_pt_create(struct sw_sync_timeline *obj, u32 value) +struct fence *sw_sync_pt_create(struct fence_timeline *obj, u32 value) { - return fence_create_on_timeline(&obj->obj, &sw_sync_fence_ops, + return fence_create_on_timeline(obj, &sw_sync_fence_ops, sizeof(struct fence), value); } EXPORT_SYMBOL(sw_sync_pt_create);
-struct sw_sync_timeline *sw_sync_timeline_create(const char *name) +struct fence_timeline *sw_sync_timeline_create(const char *name) { - struct sw_sync_timeline *obj = (struct sw_sync_timeline *) - fence_timeline_create(1, sizeof(struct sw_sync_timeline), + return fence_timeline_create(1, sizeof(struct fence_timeline), "sw_sync", name); - - return obj; } EXPORT_SYMBOL(sw_sync_timeline_create);
-void sw_sync_timeline_inc(struct sw_sync_timeline *obj, u32 inc) +void sw_sync_timeline_inc(struct fence_timeline *obj, u32 inc) { - fence_timeline_signal(&obj->obj, inc); + fence_timeline_signal(obj, inc); } EXPORT_SYMBOL(sw_sync_timeline_inc); diff --git a/drivers/staging/android/sw_sync.h b/drivers/staging/android/sw_sync.h index 85ef780..f912888 100644 --- a/drivers/staging/android/sw_sync.h +++ b/drivers/staging/android/sw_sync.h @@ -22,34 +22,22 @@ #include "sync.h" #include "uapi/sw_sync.h"
-struct sw_sync_timeline { - struct fence_timeline obj; - - u32 value; -}; - -struct sw_sync_pt { - struct fence pt; - - u32 value; -}; - #if IS_ENABLED(CONFIG_SW_SYNC) -struct sw_sync_timeline *sw_sync_timeline_create(const char *name); -void sw_sync_timeline_inc(struct sw_sync_timeline *obj, u32 inc); +struct fence_timeline *sw_sync_timeline_create(const char *name); +void sw_sync_timeline_inc(struct fence_timeline *obj, u32 inc);
-struct fence *sw_sync_pt_create(struct sw_sync_timeline *obj, u32 value); +struct fence *sw_sync_pt_create(struct fence_timeline *obj, u32 value); #else -static inline struct sw_sync_timeline *sw_sync_timeline_create(const char *name) +static inline struct fence_timeline *sw_sync_timeline_create(const char *name) { return NULL; }
-static inline void sw_sync_timeline_inc(struct sw_sync_timeline *obj, u32 inc) +static inline void sw_sync_timeline_inc(struct fence_timeline *obj, u32 inc) { }
-static inline struct fence *sw_sync_pt_create(struct sw_sync_timeline *obj, +static inline struct fence *sw_sync_pt_create(struct fence_timeline *obj, u32 value) { return NULL; diff --git a/drivers/staging/android/sync_debug.c b/drivers/staging/android/sync_debug.c index 89b334c..13d225f 100644 --- a/drivers/staging/android/sync_debug.c +++ b/drivers/staging/android/sync_debug.c @@ -225,7 +225,7 @@ static const struct file_operations sync_info_debugfs_fops = { /* opening sw_sync create a new sync obj */ static int sw_sync_debugfs_open(struct inode *inode, struct file *file) { - struct sw_sync_timeline *obj; + struct fence_timeline *obj; char task_comm[TASK_COMM_LEN];
get_task_comm(task_comm, current); @@ -241,13 +241,13 @@ static int sw_sync_debugfs_open(struct inode *inode, struct file *file)
static int sw_sync_debugfs_release(struct inode *inode, struct file *file) { - struct sw_sync_timeline *obj = file->private_data; + struct fence_timeline *obj = file->private_data;
- fence_timeline_destroy(&obj->obj); + fence_timeline_destroy(obj); return 0; }
-static long sw_sync_ioctl_create_fence(struct sw_sync_timeline *obj, +static long sw_sync_ioctl_create_fence(struct fence_timeline *obj, unsigned long arg) { int fd = get_unused_fd_flags(O_CLOEXEC); @@ -294,7 +294,7 @@ err: return err; }
-static long sw_sync_ioctl_inc(struct sw_sync_timeline *obj, unsigned long arg) +static long sw_sync_ioctl_inc(struct fence_timeline *obj, unsigned long arg) { u32 value;
@@ -309,7 +309,7 @@ static long sw_sync_ioctl_inc(struct sw_sync_timeline *obj, unsigned long arg) static long sw_sync_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { - struct sw_sync_timeline *obj = file->private_data; + struct fence_timeline *obj = file->private_data;
switch (cmd) { case SW_SYNC_IOC_CREATE_FENCE: