aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>2016-05-31 16:59:09 -0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-06-17 21:17:40 -0700
commit342952d3a5c4d128649c7fd8e34d7d5eb6d036aa (patch)
tree3a18fde3f7b30b0d42203858a31203a7dd36a8a0
parent6f65aa8925f7a908eb4d08339c03c40a300ac461 (diff)
staging/android: remove 'destroyed' member from struct sync_timeline
'destroyed' was set but not used ny anyone. 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>
-rw-r--r--drivers/staging/android/sw_sync.c5
-rw-r--r--drivers/staging/android/sync.h5
2 files changed, 1 insertions, 9 deletions
diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c
index 72262ba..1f956b9 100644
--- a/drivers/staging/android/sw_sync.c
+++ b/drivers/staging/android/sw_sync.c
@@ -107,11 +107,6 @@ static void sync_timeline_put(struct sync_timeline *obj)
*/
static void sync_timeline_destroy(struct sync_timeline *obj)
{
- obj->destroyed = true;
- /*
- * Ensure timeline is marked as destroyed before
- * changing timeline's fences status.
- */
smp_wmb();
sync_timeline_put(obj);
diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h
index 3a50851..3c551f5 100644
--- a/drivers/staging/android/sync.h
+++ b/drivers/staging/android/sync.h
@@ -25,10 +25,8 @@
* @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
- * @destroyed: set when sync_timeline is destroyed
* @child_list_head: list of children sync_pts for this sync_timeline
- * @child_list_lock: lock protecting @child_list_head, destroyed, and
- * fence.status
+ * @child_list_lock: lock protecting @child_list_head and fence.status
* @active_list_head: list of active (unsignaled/errored) sync_pts
* @sync_timeline_list: membership in global sync_timeline_list
*/
@@ -38,7 +36,6 @@ struct sync_timeline {
char name[32];
/* protected by child_list_lock */
- bool destroyed;
int context, value;
struct list_head child_list_head;