aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>2016-05-31 16:59:10 -0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-06-17 21:17:40 -0700
commit711102325302d793aa0eee493be79ce9c32ae426 (patch)
treea954f6248375c0753d4b17c0cdca032e45b4aa2c
parent342952d3a5c4d128649c7fd8e34d7d5eb6d036aa (diff)
staging/android: remove sync_timeline_destroy()
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 <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.c19
1 files changed, 3 insertions, 16 deletions
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;
}