Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bf39a94 authored by Ingo Molnar's avatar Ingo Molnar Committed by Thomas Gleixner
Browse files

ftrace: cleanups 



no code changed.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent d4c5a2f5

kernel/trace/ftrace.c

+4 −1
Original line number Diff line number Diff line
@@ -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;

}

kernel/trace/trace.c

+35 −37
Original line number Diff line number Diff line
@@ -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
@@ -1925,8 +1923,8 @@ 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 = {