summaryrefslogtreecommitdiffstats
path: root/drivers/staging/android/trace/sync.h
diff options
context:
space:
mode:
authorGustavo Padovan2016-05-31 21:58:57 +0200
committerGreg Kroah-Hartman2016-06-18 06:17:40 +0200
commit5c1401f83a16b7ee3762c9044ab56ed3f3cdcdcd (patch)
tree5205e1d888a68e70d44f061f1838f998c32c9537 /drivers/staging/android/trace/sync.h
parentstaging/android: store last signaled value on sync timeline (diff)
downloadkernel-qcow2-linux-5c1401f83a16b7ee3762c9044ab56ed3f3cdcdcd.tar.gz
kernel-qcow2-linux-5c1401f83a16b7ee3762c9044ab56ed3f3cdcdcd.tar.xz
kernel-qcow2-linux-5c1401f83a16b7ee3762c9044ab56ed3f3cdcdcd.zip
staging/android: remove .{fence, timeline}_value_str() from timeline_ops
Now that the value of fence and the timeline are not stored by sw_sync anymore we can remove this extra abstraction to retrieve this data. This patch changes both fence_ops (.fence_value_str and .timeline_value_str) to return the str directly. It also clean up struct sync_timeline_ops by removing both ops from there. 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>
Diffstat (limited to 'drivers/staging/android/trace/sync.h')
-rw-r--r--drivers/staging/android/trace/sync.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/staging/android/trace/sync.h b/drivers/staging/android/trace/sync.h
index a0f80f41677e..d7f6457f4b96 100644
--- a/drivers/staging/android/trace/sync.h
+++ b/drivers/staging/android/trace/sync.h
@@ -15,21 +15,15 @@ TRACE_EVENT(sync_timeline,
TP_STRUCT__entry(
__string(name, timeline->name)
- __array(char, value, 32)
+ __field(u32, value)
),
TP_fast_assign(
__assign_str(name, timeline->name);
- if (timeline->ops->timeline_value_str) {
- timeline->ops->timeline_value_str(timeline,
- __entry->value,
- sizeof(__entry->value));
- } else {
- __entry->value[0] = '\0';
- }
+ __entry->value = timeline->value;
),
- TP_printk("name=%s value=%s", __get_str(name), __entry->value)
+ TP_printk("name=%s value=%d", __get_str(name), __entry->value)
);
#endif /* if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ) */