staging/android: remove .{fence, timeline}_value_str() from timeline_ops

[cascardo/linux.git] / drivers / staging / android / sw_sync.c

diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c
index af39ff5..4200b12 100644 (file)
--- a/drivers/staging/android/sw_sync.c
+++ b/drivers/staging/android/sw_sync.c
@@ -30,7 +30,7 @@ struct fence *sw_sync_pt_create(struct sw_sync_timeline *obj, u32 value)
        struct sw_sync_pt *pt;
 
        pt = (struct sw_sync_pt *)
-               sync_pt_create(&obj->obj, sizeof(struct sw_sync_pt));
+               sync_pt_create(&obj->obj, sizeof(struct sw_sync_pt), value);
 
        pt->value = value;
 
@@ -38,35 +38,8 @@ struct fence *sw_sync_pt_create(struct sw_sync_timeline *obj, u32 value)
 }
 EXPORT_SYMBOL(sw_sync_pt_create);
 
-static int sw_sync_fence_has_signaled(struct fence *fence)
-{
-       struct sw_sync_pt *pt = (struct sw_sync_pt *)fence;
-       struct sw_sync_timeline *obj =
-               (struct sw_sync_timeline *)fence_parent(fence);
-
-       return (pt->value > obj->value) ? 0 : 1;
-}
-
-static void sw_sync_timeline_value_str(struct sync_timeline *sync_timeline,
-                                      char *str, int size)
-{
-       struct sw_sync_timeline *timeline =
-               (struct sw_sync_timeline *)sync_timeline;
-       snprintf(str, size, "%d", timeline->value);
-}
-
-static void sw_sync_fence_value_str(struct fence *fence, char *str, int size)
-{
-       struct sw_sync_pt *pt = (struct sw_sync_pt *)fence;
-
-       snprintf(str, size, "%d", pt->value);
-}
-
 static struct sync_timeline_ops sw_sync_timeline_ops = {
        .driver_name = "sw_sync",
-       .has_signaled = sw_sync_fence_has_signaled,
-       .timeline_value_str = sw_sync_timeline_value_str,
-       .fence_value_str = sw_sync_fence_value_str,
 };
 
 struct sw_sync_timeline *sw_sync_timeline_create(const char *name)
@@ -82,8 +55,6 @@ EXPORT_SYMBOL(sw_sync_timeline_create);
 
 void sw_sync_timeline_inc(struct sw_sync_timeline *obj, u32 inc)
 {
-       obj->value += inc;
-
-       sync_timeline_signal(&obj->obj);
+       sync_timeline_signal(&obj->obj, inc);
 }
 EXPORT_SYMBOL(sw_sync_timeline_inc);