| Message ID | 20180503181706.22120-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 03 May 2018, Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > 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> Pushed to drm-intel-next-queued, thanks for the patch. BR, Jani. > --- > drivers/gpu/drm/i915/intel_pipe_crc.c | 22 ++++++++++------------ > 1 file changed, 10 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_pipe_crc.c b/drivers/gpu/drm/i915/intel_pipe_crc.c > index 4f367c16e9e5..39a4e4edda07 100644 > --- a/drivers/gpu/drm/i915/intel_pipe_crc.c > +++ b/drivers/gpu/drm/i915/intel_pipe_crc.c > @@ -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,
diff --git a/drivers/gpu/drm/i915/intel_pipe_crc.c b/drivers/gpu/drm/i915/intel_pipe_crc.c index 4f367c16e9e5..39a4e4edda07 100644 --- a/drivers/gpu/drm/i915/intel_pipe_crc.c +++ b/drivers/gpu/drm/i915/intel_pipe_crc.c @@ -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,
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> --- drivers/gpu/drm/i915/intel_pipe_crc.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)