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

Groups > linux.kernel > #1410598

[PATCH 06/18] staging/android: rename android_fence to timeline_fence

From Gustavo Padovan <gustavo@padovan.org>
Newsgroups linux.kernel
Subject [PATCH 06/18] staging/android: rename android_fence to timeline_fence
Date 2016-05-31 22:10 +0200
Message-ID <rEY9c-7d9-53@gated-at.bofh.it> (permalink)
References <rEXZw-6Uz-27@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

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

We are moving out of staging/android so rename it to a name that is not
related to android anymore.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
 drivers/staging/android/sync.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index b3efcaa..442d808 100644
--- a/drivers/staging/android/sync.c
+++ b/drivers/staging/android/sync.c
@@ -28,7 +28,7 @@
 #define CREATE_TRACE_POINTS
 #include "trace/sync.h"
 
-static const struct fence_ops android_fence_ops;
+static const struct fence_ops timeline_fence_ops;
 
 struct sync_timeline *sync_timeline_create(int size, const char *drv_name,
 					   const char *name)
@@ -126,7 +126,7 @@ struct fence *sync_pt_create(struct sync_timeline *obj, int size,
 
 	spin_lock_irqsave(&obj->child_list_lock, flags);
 	sync_timeline_get(obj);
-	fence_init(fence, &android_fence_ops, &obj->child_list_lock,
+	fence_init(fence, &timeline_fence_ops, &obj->child_list_lock,
 		   obj->context, value);
 	list_add_tail(&fence->child_list, &obj->child_list_head);
 	INIT_LIST_HEAD(&fence->active_list);
@@ -135,21 +135,21 @@ struct fence *sync_pt_create(struct sync_timeline *obj, int size,
 }
 EXPORT_SYMBOL(sync_pt_create);
 
-static const char *android_fence_get_driver_name(struct fence *fence)
+static const char *timeline_fence_get_driver_name(struct fence *fence)
 {
 	struct sync_timeline *parent = fence_parent(fence);
 
 	return parent->drv_name;
 }
 
-static const char *android_fence_get_timeline_name(struct fence *fence)
+static const char *timeline_fence_get_timeline_name(struct fence *fence)
 {
 	struct sync_timeline *parent = fence_parent(fence);
 
 	return parent->name;
 }
 
-static void android_fence_release(struct fence *fence)
+static void timeline_fence_release(struct fence *fence)
 {
 	struct sync_timeline *parent = fence_parent(fence);
 	unsigned long flags;
@@ -164,31 +164,31 @@ static void android_fence_release(struct fence *fence)
 	fence_free(fence);
 }
 
-static bool android_fence_signaled(struct fence *fence)
+static bool timeline_fence_signaled(struct fence *fence)
 {
 	struct sync_timeline *parent = fence_parent(fence);
 
 	return (fence->seqno > parent->value) ? false : true;
 }
 
-static bool android_fence_enable_signaling(struct fence *fence)
+static bool timeline_fence_enable_signaling(struct fence *fence)
 {
 	struct sync_timeline *parent = fence_parent(fence);
 
-	if (android_fence_signaled(fence))
+	if (timeline_fence_signaled(fence))
 		return false;
 
 	list_add_tail(&fence->active_list, &parent->active_list_head);
 	return true;
 }
 
-static void android_fence_value_str(struct fence *fence,
+static void timeline_fence_value_str(struct fence *fence,
 				    char *str, int size)
 {
 	snprintf(str, size, "%d", fence->seqno);
 }
 
-static void android_fence_timeline_value_str(struct fence *fence,
+static void timeline_fence_timeline_value_str(struct fence *fence,
 					     char *str, int size)
 {
 	struct sync_timeline *parent = fence_parent(fence);
@@ -196,13 +196,13 @@ static void android_fence_timeline_value_str(struct fence *fence,
 	snprintf(str, size, "%d", parent->value);
 }
 
-static const struct fence_ops android_fence_ops = {
-	.get_driver_name = android_fence_get_driver_name,
-	.get_timeline_name = android_fence_get_timeline_name,
-	.enable_signaling = android_fence_enable_signaling,
-	.signaled = android_fence_signaled,
+static const struct fence_ops timeline_fence_ops = {
+	.get_driver_name = timeline_fence_get_driver_name,
+	.get_timeline_name = timeline_fence_get_timeline_name,
+	.enable_signaling = timeline_fence_enable_signaling,
+	.signaled = timeline_fence_signaled,
 	.wait = fence_default_wait,
-	.release = android_fence_release,
-	.fence_value_str = android_fence_value_str,
-	.timeline_value_str = android_fence_timeline_value_str,
+	.release = timeline_fence_release,
+	.fence_value_str = timeline_fence_value_str,
+	.timeline_value_str = timeline_fence_timeline_value_str,
 };
-- 
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