Merge branch 'for-4.8/core' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / drivers / staging / android / sw_sync.c

diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c
index cf4de27266a495ae5a7e5ce924aa77e05ca7a051..115c9174705f1b1bd2fe34dac727df54c1b9b75b 100644 (file)
--- a/drivers/staging/android/sw_sync.c
+++ b/drivers/staging/android/sw_sync.c
@@ -20,7 +20,7 @@
 #include <linux/slab.h>
 #include <linux/sync_file.h>
 
-#include "sync.h"
+#include "sync_debug.h"
 
 #define CREATE_TRACE_POINTS
 #include "trace/sync.h"
@@ -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;