staging: sw_sync: Convert to use new value_str debug ops

Switch from print_obj/print_pt to the new
timeline_value_str and pt_value_str ops.

Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Cc: Erik Gilling <konkers@android.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Rob Clark <robclark@gmail.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: dri-devel@lists.freedesktop.org
Cc: Android Kernel Team <kernel-team@android.com>
Signed-off-by: Erik Gilling <konkers@android.com>
[jstultz: Add commit message]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c
index d76889357e6c1a00e41bfdb94f81abb01c7095a7..68025a5401aea28a911151775cbd4d362c81b086 100644 (file)
--- a/drivers/staging/android/sw_sync.c
+++ b/drivers/staging/android/sw_sync.c
@@ -72,23 +72,6 @@ static int sw_sync_pt_compare(struct sync_pt *a, struct sync_pt *b)
        return sw_sync_cmp(pt_a->value, pt_b->value);
 }
 
-static void sw_sync_print_obj(struct seq_file *s,
-                             struct sync_timeline *sync_timeline)
-{
-       struct sw_sync_timeline *obj = (struct sw_sync_timeline *)sync_timeline;
-
-       seq_printf(s, "%d", obj->value);
-}
-
-static void sw_sync_print_pt(struct seq_file *s, struct sync_pt *sync_pt)
-{
-       struct sw_sync_pt *pt = (struct sw_sync_pt *)sync_pt;
-       struct sw_sync_timeline *obj =
-               (struct sw_sync_timeline *)sync_pt->parent;
-
-       seq_printf(s, "%d / %d", pt->value, obj->value);
-}
-
 static int sw_sync_fill_driver_data(struct sync_pt *sync_pt,
                                    void *data, int size)
 {
@@ -102,14 +85,29 @@ static int sw_sync_fill_driver_data(struct sync_pt *sync_pt,
        return sizeof(pt->value);
 }
 
+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_pt_value_str(struct sync_pt *sync_pt,
+                                      char *str, int size)
+{
+       struct sw_sync_pt *pt = (struct sw_sync_pt *)sync_pt;
+       snprintf(str, size, "%d", pt->value);
+}
+
 struct sync_timeline_ops sw_sync_timeline_ops = {
        .driver_name = "sw_sync",
        .dup = sw_sync_pt_dup,
        .has_signaled = sw_sync_pt_has_signaled,
        .compare = sw_sync_pt_compare,
-       .print_obj = sw_sync_print_obj,
-       .print_pt = sw_sync_print_pt,
        .fill_driver_data = sw_sync_fill_driver_data,
+       .timeline_value_str = sw_sync_timeline_value_str,
+       .pt_value_str = sw_sync_pt_value_str,
 };