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: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index e69820f77b33b77b116309258601a8babbc3e67f..108ce3e1dc1374c21e8fc7fbc9756e095cb314fe 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -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);