Commit dcc28080 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Greg Kroah-Hartman

staging/android: remove sw_sync_timeline and sw_sync_pt

As we moved value storage to sync_timeline and fence those two structs
became useless and can be removed now.
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ef30afef
...@@ -25,31 +25,21 @@ ...@@ -25,31 +25,21 @@
#include "sw_sync.h" #include "sw_sync.h"
struct fence *sw_sync_pt_create(struct sw_sync_timeline *obj, u32 value) struct fence *sw_sync_pt_create(struct sync_timeline *obj, u32 value)
{ {
struct sw_sync_pt *pt; return sync_pt_create(obj, sizeof(struct fence), value);
pt = (struct sw_sync_pt *)
sync_pt_create(&obj->obj, sizeof(struct sw_sync_pt), value);
pt->value = value;
return (struct fence *)pt;
} }
EXPORT_SYMBOL(sw_sync_pt_create); EXPORT_SYMBOL(sw_sync_pt_create);
struct sw_sync_timeline *sw_sync_timeline_create(const char *name) struct sync_timeline *sw_sync_timeline_create(const char *name)
{ {
struct sw_sync_timeline *obj = (struct sw_sync_timeline *) return sync_timeline_create(sizeof(struct sync_timeline),
sync_timeline_create(sizeof(struct sw_sync_timeline), "sw_sync", name);
"sw_sync", name);
return obj;
} }
EXPORT_SYMBOL(sw_sync_timeline_create); EXPORT_SYMBOL(sw_sync_timeline_create);
void sw_sync_timeline_inc(struct sw_sync_timeline *obj, u32 inc) void sw_sync_timeline_inc(struct sync_timeline *obj, u32 inc)
{ {
sync_timeline_signal(&obj->obj, inc); sync_timeline_signal(obj, inc);
} }
EXPORT_SYMBOL(sw_sync_timeline_inc); EXPORT_SYMBOL(sw_sync_timeline_inc);
...@@ -22,34 +22,22 @@ ...@@ -22,34 +22,22 @@
#include "sync.h" #include "sync.h"
#include "uapi/sw_sync.h" #include "uapi/sw_sync.h"
struct sw_sync_timeline {
struct sync_timeline obj;
u32 value;
};
struct sw_sync_pt {
struct fence pt;
u32 value;
};
#if IS_ENABLED(CONFIG_SW_SYNC) #if IS_ENABLED(CONFIG_SW_SYNC)
struct sw_sync_timeline *sw_sync_timeline_create(const char *name); struct sync_timeline *sw_sync_timeline_create(const char *name);
void sw_sync_timeline_inc(struct sw_sync_timeline *obj, u32 inc); void sw_sync_timeline_inc(struct sync_timeline *obj, u32 inc);
struct fence *sw_sync_pt_create(struct sw_sync_timeline *obj, u32 value); struct fence *sw_sync_pt_create(struct sync_timeline *obj, u32 value);
#else #else
static inline struct sw_sync_timeline *sw_sync_timeline_create(const char *name) static inline struct sync_timeline *sw_sync_timeline_create(const char *name)
{ {
return NULL; return NULL;
} }
static inline void sw_sync_timeline_inc(struct sw_sync_timeline *obj, u32 inc) static inline void sw_sync_timeline_inc(struct sync_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 sync_timeline *obj,
u32 value) u32 value)
{ {
return NULL; return NULL;
......
...@@ -209,7 +209,7 @@ static const struct file_operations sync_info_debugfs_fops = { ...@@ -209,7 +209,7 @@ static const struct file_operations sync_info_debugfs_fops = {
/* opening sw_sync create a new sync obj */ /* opening sw_sync create a new sync obj */
static int sw_sync_debugfs_open(struct inode *inode, struct file *file) static int sw_sync_debugfs_open(struct inode *inode, struct file *file)
{ {
struct sw_sync_timeline *obj; struct sync_timeline *obj;
char task_comm[TASK_COMM_LEN]; char task_comm[TASK_COMM_LEN];
get_task_comm(task_comm, current); get_task_comm(task_comm, current);
...@@ -225,13 +225,13 @@ static int sw_sync_debugfs_open(struct inode *inode, struct file *file) ...@@ -225,13 +225,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) static int sw_sync_debugfs_release(struct inode *inode, struct file *file)
{ {
struct sw_sync_timeline *obj = file->private_data; struct sync_timeline *obj = file->private_data;
sync_timeline_destroy(&obj->obj); sync_timeline_destroy(obj);
return 0; return 0;
} }
static long sw_sync_ioctl_create_fence(struct sw_sync_timeline *obj, static long sw_sync_ioctl_create_fence(struct sync_timeline *obj,
unsigned long arg) unsigned long arg)
{ {
int fd = get_unused_fd_flags(O_CLOEXEC); int fd = get_unused_fd_flags(O_CLOEXEC);
...@@ -277,7 +277,7 @@ static long sw_sync_ioctl_create_fence(struct sw_sync_timeline *obj, ...@@ -277,7 +277,7 @@ static long sw_sync_ioctl_create_fence(struct sw_sync_timeline *obj,
return err; return err;
} }
static long sw_sync_ioctl_inc(struct sw_sync_timeline *obj, unsigned long arg) static long sw_sync_ioctl_inc(struct sync_timeline *obj, unsigned long arg)
{ {
u32 value; u32 value;
...@@ -292,7 +292,7 @@ static long sw_sync_ioctl_inc(struct sw_sync_timeline *obj, unsigned long arg) ...@@ -292,7 +292,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, static long sw_sync_ioctl(struct file *file, unsigned int cmd,
unsigned long arg) unsigned long arg)
{ {
struct sw_sync_timeline *obj = file->private_data; struct sync_timeline *obj = file->private_data;
switch (cmd) { switch (cmd) {
case SW_SYNC_IOC_CREATE_FENCE: case SW_SYNC_IOC_CREATE_FENCE:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment