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

Commit 591a033d authored by Yisheng Xie's avatar Yisheng Xie Committed by Steven Rostedt (VMware)
Browse files

tracing: Use match_string() instead of open coding it in trace_set_options() 

match_string() returns the index of an array for a matching string,
which can be used to simplify the code.

Link: http://lkml.kernel.org/r/1526546163-4609-1-git-send-email-xieyisheng1@huawei.com



Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarYisheng Xie <xieyisheng1@huawei.com>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 2026d357

kernel/trace/trace.c

+5 −10
Original line number Diff line number Diff line
@@ -4395,8 +4395,7 @@ static int trace_set_options(struct trace_array *tr, char *option) 
{

	char *cmp;

	int neg = 0;

	int ret = -ENODEV;

	int i;

	int ret;

	size_t orig_len = strlen(option);



	cmp = strstrip(option);
@@ -4408,16 +4407,12 @@ static int trace_set_options(struct trace_array *tr, char *option) 


	mutex_lock(&trace_types_lock);



	for (i = 0; trace_options[i]; i++) {

		if (strcmp(cmp, trace_options[i]) == 0) {

			ret = set_tracer_flag(tr, 1 << i, !neg);

			break;

		}

	}



	ret = match_string(trace_options, -1, cmp);

	/* If no option could be set, test the specific tracer options */

	if (!trace_options[i])

	if (ret < 0)

		ret = set_tracer_option(tr, cmp, neg);

	else

		ret = set_tracer_flag(tr, 1 << ret, !neg);



	mutex_unlock(&trace_types_lock);