[15/18] staging/android: remove sync_timeline_destroy()

Commit Message

Gustavo Padovan May 31, 2016, 7:59 p.m. UTC

From: Gustavo Padovan <[e-mail]>

This function was just used by the file release function, so we just fold
its content there and remove sync_timeline_destroy().

Signed-off-by: Gustavo Padovan <[e-mail]>
---
 drivers/staging/android/sw_sync.c | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

Patch

diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c
index 1f956b9..cf4de27 100644
--- a/drivers/staging/android/sw_sync.c
+++ b/drivers/staging/android/sw_sync.c
@@ -98,21 +98,6 @@  static void sync_timeline_put(struct sync_timeline *obj)
 }
 
 /**
- * sync_timeline_destroy() - destroys a sync object
- * @obj:	sync_timeline to destroy
- *
- * A sync implementation should call this when the @obj is going away
- * (i.e. module unload.)  @obj won't actually be freed until all its children
- * fences are freed.
- */
-static void sync_timeline_destroy(struct sync_timeline *obj)
-{
-	smp_wmb();
-
-	sync_timeline_put(obj);
-}
-
-/**
  * sync_timeline_signal() - signal a status change on a sync_timeline
  * @obj:	sync_timeline to signal
  * @inc:	num to increment on timeline->value
@@ -275,7 +260,9 @@  static int sw_sync_debugfs_release(struct inode *inode, struct file *file)
 {
 	struct sync_timeline *obj = file->private_data;
 
-	sync_timeline_destroy(obj);
+	smp_wmb();
+
+	sync_timeline_put(obj);
 	return 0;
 }