ftrace: Clean up __seq_open_private() return check

The return status check of __seq_open_private() is rather strange:

	iter = __seq_open_private();
	if (iter) {
		/* do stuff */
	}

	return iter ? 0 : -ENOMEM;

It makes much more sense to do the return of failure right away:

	iter = __seq_open_private();
	if (!iter)
		return -ENOMEM;

	/* do stuff */

	return 0;

This clean up will make updates to this code a bit nicer.

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 0556a202c055f3df34b8ef7690deeed4b50f14fd..527c4d3e8d7f8e4d0f5e017389f04fedf3bc6f79 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -3355,12 +3355,13 @@ ftrace_avail_open(struct inode *inode, struct file *file)
                return -ENODEV;
 
        iter = __seq_open_private(file, &show_ftrace_seq_ops, sizeof(*iter));
-       if (iter) {
-               iter->pg = ftrace_pages_start;
-               iter->ops = &global_ops;
-       }
+       if (!iter)
+               return -ENOMEM;
 
-       return iter ? 0 : -ENOMEM;
+       iter->pg = ftrace_pages_start;
+       iter->ops = &global_ops;
+
+       return 0;
 }
 
 static int
@@ -3369,13 +3370,14 @@ ftrace_enabled_open(struct inode *inode, struct file *file)
        struct ftrace_iterator *iter;
 
        iter = __seq_open_private(file, &show_ftrace_seq_ops, sizeof(*iter));
-       if (iter) {
-               iter->pg = ftrace_pages_start;
-               iter->flags = FTRACE_ITER_ENABLED;
-               iter->ops = &global_ops;
-       }
+       if (!iter)
+               return -ENOMEM;
 
-       return iter ? 0 : -ENOMEM;
+       iter->pg = ftrace_pages_start;
+       iter->flags = FTRACE_ITER_ENABLED;
+       iter->ops = &global_ops;
+
+       return 0;
 }
 
 /**