Messages in this thread Patch in this message | | | Date | Thu, 25 Sep 2008 15:56:03 +0100 | From | Frédéric Weisbecker <> | Subject | Re: [Patch -tip 1/3] Tracing/ftrace: Relay unhandled entry output |
| |
Ingo Molnar a écrit : > ERROR: do not use assignment in if condition > #43: FILE: kernel/trace/trace.c:1910: > + if ((ret = iter->trace->print_line(iter))) > > ERROR: do not use assignment in if condition > #48: FILE: kernel/trace/trace.c:1914: > + if ((ret = print_bin_fmt(iter))) > > ERROR: do not use assignment in if condition > #53: FILE: kernel/trace/trace.c:1918: > + if ((ret = print_hex_fmt(iter))) > > ERROR: do not use assignment in if condition > #58: FILE: kernel/trace/trace.c:1922: > + if ((ret = print_raw_fmt(iter))) > > ERROR: do not use assignment in if condition > #63: FILE: kernel/trace/trace.c:1926: > + if ((ret = print_lat_fmt(iter, iter->idx, iter->cpu))) > > total: 5 errors, 0 warnings, 0 checks, 32 lines checked > >
Oops sorry. Here it is:
Correct the coding style in the commit 803294369973b740f4c346553850b56e4b0c3c8a And remove the ret variable since print functions only return 0 or 1.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> ---
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 50ac334..e845664 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1904,27 +1904,25 @@ static int trace_empty(struct trace_iterator *iter) static int print_trace_line(struct trace_iterator *iter) { - int ret; - if (iter->trace && iter->trace->print_line) - if ((ret = iter->trace->print_line(iter))) - return ret; + if (iter->trace->print_line(iter)) + return 1; if (trace_flags & TRACE_ITER_BIN) - if ((ret = print_bin_fmt(iter))) - return ret; + if (print_bin_fmt(iter)) + return 1; if (trace_flags & TRACE_ITER_HEX) - if ((ret = print_hex_fmt(iter))) - return ret; + if (print_hex_fmt(iter)) + return 1; if (trace_flags & TRACE_ITER_RAW) - if ((ret = print_raw_fmt(iter))) - return ret; + if (print_raw_fmt(iter)) + return 1; if (iter->iter_flags & TRACE_FILE_LAT_FMT) - if ((ret = print_lat_fmt(iter, iter->idx, iter->cpu))) - return ret; + if (print_lat_fmt(iter, iter->idx, iter->cpu)) + return 1; return print_trace_fmt(iter); } | |