aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-05-12 21:20:46 +0200
committerThomas Gleixner <tglx@linutronix.de>2008-05-23 20:42:20 +0200
commit4bf39a9411a4ce8712954e03a9bd1592ee345919 (patch)
tree044694f1c69ec2588e4b60e6b60701bae2a53e81 /kernel
parentd4c5a2f5870939d837293de87b41dda0012a4572 (diff)
ftrace: cleanups
no code changed. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/ftrace.c5
-rw-r--r--kernel/trace/trace.c72
2 files changed, 39 insertions, 38 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 5e9389faaf7..97c40865a93 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -756,9 +756,11 @@ ftrace_avail_open(struct inode *inode, struct file *file)
ret = seq_open(file, &show_ftrace_seq_ops);
if (!ret) {
struct seq_file *m = file->private_data;
+
m->private = iter;
- } else
+ } else {
kfree(iter);
+ }
return ret;
}
@@ -770,6 +772,7 @@ int ftrace_avail_release(struct inode *inode, struct file *file)
seq_release(inode, file);
kfree(iter);
+
return 0;
}
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index b3811ca7407..4550afda960 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1245,10 +1245,10 @@ static int s_show(struct seq_file *m, void *v)
}
static struct seq_operations tracer_seq_ops = {
- .start = s_start,
- .next = s_next,
- .stop = s_stop,
- .show = s_show,
+ .start = s_start,
+ .next = s_next,
+ .stop = s_stop,
+ .show = s_show,
};
static struct trace_iterator notrace *
@@ -1397,10 +1397,10 @@ static int t_show(struct seq_file *m, void *v)
}
static struct seq_operations show_traces_seq_ops = {
- .start = t_start,
- .next = t_next,
- .stop = t_stop,
- .show = t_show,
+ .start = t_start,
+ .next = t_next,
+ .stop = t_stop,
+ .show = t_show,
};
static int show_traces_open(struct inode *inode, struct file *file)
@@ -1420,17 +1420,17 @@ static int show_traces_open(struct inode *inode, struct file *file)
}
static struct file_operations tracing_fops = {
- .open = tracing_open,
- .read = seq_read,
- .llseek = seq_lseek,
- .release = tracing_release,
+ .open = tracing_open,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = tracing_release,
};
static struct file_operations tracing_lt_fops = {
- .open = tracing_lt_open,
- .read = seq_read,
- .llseek = seq_lseek,
- .release = tracing_release,
+ .open = tracing_lt_open,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = tracing_release,
};
static struct file_operations show_traces_fops = {
@@ -1620,8 +1620,7 @@ tracing_set_trace_read(struct file *filp, char __user *ubuf,
r = sprintf(buf, "\n");
mutex_unlock(&trace_types_lock);
- return simple_read_from_buffer(ubuf, cnt, ppos,
- buf, r);
+ return simple_read_from_buffer(ubuf, cnt, ppos, buf, r);
}
static ssize_t
@@ -1680,8 +1679,7 @@ tracing_max_lat_read(struct file *filp, char __user *ubuf,
*ptr == (unsigned long)-1 ? -1 : nsecs_to_usecs(*ptr));
if (r > 64)
r = 64;
- return simple_read_from_buffer(ubuf, cnt, ppos,
- buf, r);
+ return simple_read_from_buffer(ubuf, cnt, ppos, buf, r);
}
static ssize_t
@@ -1891,27 +1889,27 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
}
static struct file_operations tracing_max_lat_fops = {
- .open = tracing_open_generic,
- .read = tracing_max_lat_read,
- .write = tracing_max_lat_write,
+ .open = tracing_open_generic,
+ .read = tracing_max_lat_read,
+ .write = tracing_max_lat_write,
};
static struct file_operations tracing_ctrl_fops = {
- .open = tracing_open_generic,
- .read = tracing_ctrl_read,
- .write = tracing_ctrl_write,
+ .open = tracing_open_generic,
+ .read = tracing_ctrl_read,
+ .write = tracing_ctrl_write,
};
static struct file_operations set_tracer_fops = {
- .open = tracing_open_generic,
- .read = tracing_set_trace_read,
- .write = tracing_set_trace_write,
+ .open = tracing_open_generic,
+ .read = tracing_set_trace_read,
+ .write = tracing_set_trace_write,
};
static struct file_operations tracing_pipe_fops = {
- .open = tracing_open_pipe,
- .read = tracing_read_pipe,
- .release = tracing_release_pipe,
+ .open = tracing_open_pipe,
+ .read = tracing_read_pipe,
+ .release = tracing_release_pipe,
};
#ifdef CONFIG_DYNAMIC_FTRACE
@@ -1925,13 +1923,13 @@ tracing_read_long(struct file *filp, char __user *ubuf,
int r;
r = sprintf(buf, "%ld\n", *p);
- return simple_read_from_buffer(ubuf, cnt, ppos,
- buf, r);
+
+ return simple_read_from_buffer(ubuf, cnt, ppos, buf, r);
}
static struct file_operations tracing_read_long_fops = {
- .open = tracing_open_generic,
- .read = tracing_read_long,
+ .open = tracing_open_generic,
+ .read = tracing_read_long,
};
#endif
@@ -2033,7 +2031,7 @@ static __init void tracer_init_debugfs(void)
/* dummy trace to disable tracing */
static struct tracer no_tracer __read_mostly =
{
- .name = "none",
+ .name = "none",
};
static int trace_alloc_page(void)