Merge tag 'sound-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux-2.6-microblaze.git] / kernel / trace / trace_uprobe.c

diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 33ff6a2..8520acc 100644 (file)
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -552,8 +552,7 @@ error:
        return ret;
 
 fail_address_parse:
-       if (inode)
-               iput(inode);
+       iput(inode);
 
        pr_info("Failed to parse address or file.\n");
 
@@ -606,7 +605,7 @@ static int probes_seq_show(struct seq_file *m, void *v)
        for (i = 0; i < tu->tp.nr_args; i++)
                seq_printf(m, " %s=%s", tu->tp.args[i].name, tu->tp.args[i].comm);
 
-       seq_printf(m, "\n");
+       seq_putc(m, '\n');
        return 0;
 }
 
@@ -852,16 +851,14 @@ print_uprobe_event(struct trace_iterator *iter, int flags, struct trace_event *e
        tu = container_of(event, struct trace_uprobe, tp.call.event);
 
        if (is_ret_probe(tu)) {
-               if (!trace_seq_printf(s, "%s: (0x%lx <- 0x%lx)",
-                                       ftrace_event_name(&tu->tp.call),
-                                       entry->vaddr[1], entry->vaddr[0]))
-                       goto partial;
+               trace_seq_printf(s, "%s: (0x%lx <- 0x%lx)",
+                                ftrace_event_name(&tu->tp.call),
+                                entry->vaddr[1], entry->vaddr[0]);
                data = DATAOF_TRACE_ENTRY(entry, true);
        } else {
-               if (!trace_seq_printf(s, "%s: (0x%lx)",
-                                       ftrace_event_name(&tu->tp.call),
-                                       entry->vaddr[0]))
-                       goto partial;
+               trace_seq_printf(s, "%s: (0x%lx)",
+                                ftrace_event_name(&tu->tp.call),
+                                entry->vaddr[0]);
                data = DATAOF_TRACE_ENTRY(entry, false);
        }
 
@@ -869,14 +866,13 @@ print_uprobe_event(struct trace_iterator *iter, int flags, struct trace_event *e
                struct probe_arg *parg = &tu->tp.args[i];
 
                if (!parg->type->print(s, parg->name, data + parg->offset, entry))
-                       goto partial;
+                       goto out;
        }
 
-       if (trace_seq_puts(s, "\n"))
-               return TRACE_TYPE_HANDLED;
+       trace_seq_putc(s, '\n');
 
-partial:
-       return TRACE_TYPE_PARTIAL_LINE;
+ out:
+       return trace_handle_return(s);
 }
 
 typedef bool (*filter_func_t)(struct uprobe_consumer *self,