Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1410577

[PATCH 16/18] staging/android: remove drv_name from sync_timeline

Show all headers | View raw

From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

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>
---
 drivers/staging/android/sw_sync.c    | 11 +++--------
 drivers/staging/android/sync.h       |  2 --
 drivers/staging/android/sync_debug.c |  2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c
index cf4de27..ae56ece 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;
 
diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h
index 3c551f5..48e2d1c 100644
--- a/drivers/staging/android/sync.h
+++ b/drivers/staging/android/sync.h
@@ -23,7 +23,6 @@
 /**
  * struct sync_timeline - sync object
  * @kref:		reference count on fence.
- * @drv_name:		drv_name of the driver using the sync_timeline
  * @name:		name of the sync_timeline. Useful for debugging
  * @child_list_head:	list of children sync_pts for this sync_timeline
  * @child_list_lock:	lock protecting @child_list_head and fence.status
@@ -32,7 +31,6 @@
  */
 struct sync_timeline {
 	struct kref		kref;
-	char			drv_name[32];
 	char			name[32];
 
 	/* protected by child_list_lock */
diff --git a/drivers/staging/android/sync_debug.c b/drivers/staging/android/sync_debug.c
index 77386d2..b2697a1 100644
--- a/drivers/staging/android/sync_debug.c
+++ b/drivers/staging/android/sync_debug.c
@@ -120,7 +120,7 @@ static void sync_print_obj(struct seq_file *s, struct sync_timeline *obj)
 	struct list_head *pos;
 	unsigned long flags;
 
-	seq_printf(s, "%s %s: %d\n", obj->name, obj->drv_name, obj->value);
+	seq_printf(s, "%s: %d\n", obj->name, obj->value);
 
 	spin_lock_irqsave(&obj->child_list_lock, flags);
 	list_for_each(pos, &obj->child_list_head) {
-- 
2.5.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/18] staging/android: clean up SW_SYNC Gustavo Padovan <gustavo@padovan.org> - 2016-05-31 22:00 +0200
  [PATCH 08/18] staging/android: remove size arg of sync_timeline_create() Gustavo Padovan <gustavo@padovan.org> - 2016-05-31 22:10 +0200
  [PATCH 16/18] staging/android: remove drv_name from sync_timeline Gustavo Padovan <gustavo@padovan.org> - 2016-05-31 22:10 +0200
  [PATCH 04/18] staging/android: remove sw_sync_timeline and sw_sync_pt Gustavo Padovan <gustavo@padovan.org> - 2016-05-31 22:10 +0200
  [PATCH 17/18] staging/android: rename sync.h to sync_debug.h Gustavo Padovan <gustavo@padovan.org> - 2016-05-31 22:10 +0200
  [PATCH 05/18] staging/android: remove sw_sync.[ch] files Gustavo Padovan <gustavo@padovan.org> - 2016-05-31 22:10 +0200
  [PATCH 13/18] staging/android: make sw_ioctl info internal to sw_sync.c Gustavo Padovan <gustavo@padovan.org> - 2016-05-31 22:10 +0200
  [PATCH 10/18] staging/android: move sw_sync related code to sw_sync.c Gustavo Padovan <gustavo@padovan.org> - 2016-05-31 22:10 +0200
  [PATCH 12/18] staging/android: make sync_timeline internal to sw_sync Gustavo Padovan <gustavo@padovan.org> - 2016-05-31 22:10 +0200
  [PATCH 07/18] staging/android: remove unnecessary check for fence Gustavo Padovan <gustavo@padovan.org> - 2016-05-31 22:10 +0200
  [PATCH 09/18] staging/android: bring struct sync_pt back Gustavo Padovan <gustavo@padovan.org> - 2016-05-31 22:10 +0200
  [PATCH 14/18] staging/android: remove 'destroyed' member from struct sync_timeline Gustavo Padovan <gustavo@padovan.org> - 2016-05-31 22:10 +0200
  [PATCH 18/18] staging/android: add DEBUG_FS dependence on Kconfig Gustavo Padovan <gustavo@padovan.org> - 2016-05-31 22:10 +0200
  [PATCH 02/18] staging/android: remove .{fence,timeline}_value_str() from timeline_ops Gustavo Padovan <gustavo@padovan.org> - 2016-05-31 22:10 +0200
  [PATCH 01/18] staging/android: store last signaled value on sync timeline Gustavo Padovan <gustavo@padovan.org> - 2016-05-31 22:10 +0200
  [PATCH 11/18] staging/android: clean up #includes in the sync framework Gustavo Padovan <gustavo@padovan.org> - 2016-05-31 22:10 +0200
  [PATCH 15/18] staging/android: remove sync_timeline_destroy() Gustavo Padovan <gustavo@padovan.org> - 2016-05-31 22:10 +0200
  [PATCH 03/18] staging/android: remove struct sync_timeline_ops Gustavo Padovan <gustavo@padovan.org> - 2016-05-31 22:10 +0200
  [PATCH 06/18] staging/android: rename android_fence to timeline_fence Gustavo Padovan <gustavo@padovan.org> - 2016-05-31 22:10 +0200
  Re: [PATCH 00/18] staging/android: clean up SW_SYNC Gustavo Padovan <gustavo@padovan.org> - 2016-06-08 21:10 +0200
    Re: [PATCH 00/18] staging/android: clean up SW_SYNC Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-06-09 07:50 +0200
      Re: [PATCH 00/18] staging/android: clean up SW_SYNC Daniel Vetter <daniel@ffwll.ch> - 2016-06-09 10:30 +0200
        Re: [PATCH 00/18] staging/android: clean up SW_SYNC Sumit Semwal <sumit.semwal@linaro.org> - 2016-06-09 16:00 +0200

csiph-web