[for-linus][PATCH 10/11] tracing/filters: Change parse_pred() cpulist ternary into an if block

From: Steven Rostedt
Date: Sat Sep 02 2023 - 07:51:30 EST


From: Valentin Schneider <vschneid@xxxxxxxxxx>

Review comments noted that an if block would be clearer than a ternary, so
swap it out.

No change in behaviour intended

Link: https://lkml.kernel.org/r/20230901151039.125186-4-vschneid@xxxxxxxxxx

Cc: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
Signed-off-by: Valentin Schneider <vschneid@xxxxxxxxxx>
Signed-off-by: Steven Rostedt (Google) <rostedt@xxxxxxxxxxx>
---
kernel/trace/trace_events_filter.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index eb331e8b00b6..09b4733a2933 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -1782,13 +1782,17 @@ static int parse_pred(const char *str, void *data,
FILTER_PRED_FN_CPUMASK;
} else if (field->filter_type == FILTER_CPU) {
if (single) {
- pred->op = pred->op == OP_BAND ? OP_EQ : pred->op;
+ if (pred->op == OP_BAND)
+ pred->op = OP_EQ;
+
pred->fn_num = FILTER_PRED_FN_CPU;
} else {
pred->fn_num = FILTER_PRED_FN_CPU_CPUMASK;
}
} else if (single) {
- pred->op = pred->op == OP_BAND ? OP_EQ : pred->op;
+ if (pred->op == OP_BAND)
+ pred->op = OP_EQ;
+
pred->fn_num = select_comparison_fn(pred->op, field->size, false);
if (pred->op == OP_NE)
pred->not = 1;
--
2.40.1