summaryrefslogtreecommitdiff
path: root/drivers/staging/android/sync_debug.c
diff options
context:
space:
mode:
authorPeter Senna Tschudin <peter.senna@gmail.com>2014-07-12 19:55:56 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-12 20:24:19 (GMT)
commit954513551f5afb7893b7c688a67219356ab3efe6 (patch)
tree9d840c2fee4c0d84d0526d6d9f454dd5a929e876 /drivers/staging/android/sync_debug.c
parentd8e1e01289316552bd5037aaa1f5a0e8d22b0eb3 (diff)
downloadlinux-954513551f5afb7893b7c688a67219356ab3efe6.tar.xz
staging: android: Cleanup style issues
This patch fixes the following checkpatch warnings: - Remove else after return - Add space after declaration Tested by compilation only. Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android/sync_debug.c')
-rw-r--r--drivers/staging/android/sync_debug.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/staging/android/sync_debug.c b/drivers/staging/android/sync_debug.c
index a9f7fd5..257fc91 100644
--- a/drivers/staging/android/sync_debug.c
+++ b/drivers/staging/android/sync_debug.c
@@ -74,10 +74,11 @@ static const char *sync_status_str(int status)
{
if (status == 0)
return "signaled";
- else if (status > 0)
+
+ if (status > 0)
return "active";
- else
- return "error";
+
+ return "error";
}
static void sync_print_pt(struct seq_file *s, struct sync_pt *pt, bool fence)
@@ -95,12 +96,14 @@ static void sync_print_pt(struct seq_file *s, struct sync_pt *pt, bool fence)
if (status <= 0) {
struct timeval tv = ktime_to_timeval(pt->base.timestamp);
+
seq_printf(s, "@%ld.%06ld", tv.tv_sec, tv.tv_usec);
}
if (parent->ops->timeline_value_str &&
parent->ops->pt_value_str) {
char value[64];
+
parent->ops->pt_value_str(pt, value, sizeof(value));
seq_printf(s, ": %s", value);
if (fence) {
@@ -122,6 +125,7 @@ static void sync_print_obj(struct seq_file *s, struct sync_timeline *obj)
if (obj->ops->timeline_value_str) {
char value[64];
+
obj->ops->timeline_value_str(obj, value, sizeof(value));
seq_printf(s, ": %s", value);
}
@@ -234,6 +238,7 @@ void sync_dump(void)
for (i = 0; i < s.count; i += DUMP_CHUNK) {
if ((s.count - i) > DUMP_CHUNK) {
char c = s.buf[i + DUMP_CHUNK];
+
s.buf[i + DUMP_CHUNK] = 0;
pr_cont("%s", s.buf + i);
s.buf[i + DUMP_CHUNK] = c;