OSDN Git Service

i915: Convert to use match_string() helper
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Thu, 3 May 2018 18:17:06 +0000 (21:17 +0300)
committerJani Nikula <jani.nikula@intel.com>
Fri, 4 May 2018 07:23:43 +0000 (10:23 +0300)
The new helper returns index of the matching string in an array.
We are going to use it here.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180503181706.22120-1-andriy.shevchenko@linux.intel.com
drivers/gpu/drm/i915/intel_pipe_crc.c

index 4f367c1..39a4e4e 100644 (file)
@@ -766,13 +766,12 @@ display_crc_ctl_parse_object(const char *buf, enum intel_pipe_crc_object *o)
 {
        int i;
 
-       for (i = 0; i < ARRAY_SIZE(pipe_crc_objects); i++)
-               if (!strcmp(buf, pipe_crc_objects[i])) {
-                       *o = i;
-                       return 0;
-               }
+       i = match_string(pipe_crc_objects, ARRAY_SIZE(pipe_crc_objects), buf);
+       if (i < 0)
+               return i;
 
-       return -EINVAL;
+       *o = i;
+       return 0;
 }
 
 static int display_crc_ctl_parse_pipe(struct drm_i915_private *dev_priv,
@@ -798,13 +797,12 @@ display_crc_ctl_parse_source(const char *buf, enum intel_pipe_crc_source *s)
                return 0;
        }
 
-       for (i = 0; i < ARRAY_SIZE(pipe_crc_sources); i++)
-               if (!strcmp(buf, pipe_crc_sources[i])) {
-                       *s = i;
-                       return 0;
-               }
+       i = match_string(pipe_crc_sources, ARRAY_SIZE(pipe_crc_sources), buf);
+       if (i < 0)
+               return i;
 
-       return -EINVAL;
+       *s = i;
+       return 0;
 }
 
 static int display_crc_ctl_parse(struct drm_i915_private *dev_priv,