diff options
author | Gustavo Padovan | 2016-05-31 21:59:11 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2016-06-18 06:17:40 +0200 |
commit | b9bc2b7b658a4bee8884e2c339a0a27f4bfa7f22 (patch) | |
tree | d6020d359f54aab964575f73d6671f7ce6c0bdd0 /drivers/staging/android/sw_sync.c | |
parent | staging/android: remove sync_timeline_destroy() (diff) | |
download | kernel-qcow2-linux-b9bc2b7b658a4bee8884e2c339a0a27f4bfa7f22.tar.gz kernel-qcow2-linux-b9bc2b7b658a4bee8884e2c339a0a27f4bfa7f22.tar.xz kernel-qcow2-linux-b9bc2b7b658a4bee8884e2c339a0a27f4bfa7f22.zip |
staging/android: remove drv_name from sync_timeline
As it is internal to sw_sync now this value will always be "sw_sync".
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Sumit Semwal <sumit.semwal@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android/sw_sync.c')
-rw-r--r-- | drivers/staging/android/sw_sync.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c index cf4de27266a4..ae56eceeeaac 100644 --- a/drivers/staging/android/sw_sync.c +++ b/drivers/staging/android/sw_sync.c @@ -48,14 +48,12 @@ static inline struct sync_pt *fence_to_sync_pt(struct fence *fence) /** * sync_timeline_create() - creates a sync object - * @drv_name: sync_timeline driver name * @name: sync_timeline name * * Creates a new sync_timeline. Returns the sync_timeline object or NULL in * case of error. */ -struct sync_timeline *sync_timeline_create(const char *drv_name, - const char *name) +struct sync_timeline *sync_timeline_create(const char *name) { struct sync_timeline *obj; @@ -66,7 +64,6 @@ struct sync_timeline *sync_timeline_create(const char *drv_name, kref_init(&obj->kref); obj->context = fence_context_alloc(1); strlcpy(obj->name, name, sizeof(obj->name)); - strlcpy(obj->drv_name, drv_name, sizeof(obj->drv_name)); INIT_LIST_HEAD(&obj->child_list_head); INIT_LIST_HEAD(&obj->active_list_head); @@ -161,9 +158,7 @@ static struct sync_pt *sync_pt_create(struct sync_timeline *obj, int size, static const char *timeline_fence_get_driver_name(struct fence *fence) { - struct sync_timeline *parent = fence_parent(fence); - - return parent->drv_name; + return "sw_sync"; } static const char *timeline_fence_get_timeline_name(struct fence *fence) @@ -247,7 +242,7 @@ static int sw_sync_debugfs_open(struct inode *inode, struct file *file) get_task_comm(task_comm, current); - obj = sync_timeline_create("sw_sync", task_comm); + obj = sync_timeline_create(task_comm); if (!obj) return -ENOMEM; |