* [PATCH 20/33] video: fbdev: pxafb: use match_string() helper
[not found] <1526903890-35761-1-git-send-email-xieyisheng1@huawei.com>
@ 2018-05-21 11:57 ` Yisheng Xie
2018-05-21 22:01 ` Andy Shevchenko
2018-05-21 11:57 ` [PATCH 21/33] drm/nouveau: " Yisheng Xie
` (3 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: Yisheng Xie @ 2018-05-21 11:57 UTC (permalink / raw)
To: linux-kernel
Cc: Yisheng Xie, Bartlomiej Zolnierkiewicz, Arvind Yadav, dri-devel
match_string() returns the index of an array for a matching string,
which can be used intead of open coded variant.
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: Arvind Yadav <arvind.yadav.cs@gmail.com>
Cc: dri-devel@lists.freedesktop.org
linux-fbdev@vger.kernel.org
Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
---
drivers/video/fbdev/pxafb.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c
index c3d49e1..702193d 100644
--- a/drivers/video/fbdev/pxafb.c
+++ b/drivers/video/fbdev/pxafb.c
@@ -2115,10 +2115,8 @@ static int of_get_pxafb_display(struct device *dev, struct device_node *disp,
if (ret)
s = "color-tft";
- for (i = 0; lcd_types[i]; i++)
- if (!strcmp(s, lcd_types[i]))
- break;
- if (!i || !lcd_types[i]) {
+ i = match_string(lcd_types, -1, s);
+ if (i <= 0) {
dev_err(dev, "lcd-type %s is unknown\n", s);
return -EINVAL;
}
--
1.7.12.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 21/33] drm/nouveau: use match_string() helper
[not found] <1526903890-35761-1-git-send-email-xieyisheng1@huawei.com>
2018-05-21 11:57 ` [PATCH 20/33] video: fbdev: pxafb: use match_string() helper Yisheng Xie
@ 2018-05-21 11:57 ` Yisheng Xie
[not found] ` <1526903890-35761-22-git-send-email-xieyisheng1-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2018-05-21 11:57 ` [PATCH 22/33] drm/i915: " Yisheng Xie
` (2 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: Yisheng Xie @ 2018-05-21 11:57 UTC (permalink / raw)
To: linux-kernel; +Cc: Yisheng Xie, Ben Skeggs, David Airlie, dri-devel, nouveau
match_string() returns the index of an array for a matching string,
which can be used intead of open coded variant.
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: David Airlie <airlied@linux.ie>
Cc: dri-devel@lists.freedesktop.org
Cc: nouveau@lists.freedesktop.org
Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
---
drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
index 6d99f11..a6b4c4a 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
@@ -644,14 +644,11 @@ static int nv17_tv_create_resources(struct drm_encoder *encoder,
int i;
if (nouveau_tv_norm) {
- for (i = 0; i < num_tv_norms; i++) {
- if (!strcmp(nv17_tv_norm_names[i], nouveau_tv_norm)) {
- tv_enc->tv_norm = i;
- break;
- }
- }
-
- if (i == num_tv_norms)
+ i = match_string(nv17_tv_norm_names,
+ num_tv_norms, nouveau_tv_norm);
+ if (i >= 0)
+ tv_enc->tv_norm = i;
+ else
NV_WARN(drm, "Invalid TV norm setting \"%s\"\n",
nouveau_tv_norm);
}
--
1.7.12.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 22/33] drm/i915: use match_string() helper
[not found] <1526903890-35761-1-git-send-email-xieyisheng1@huawei.com>
2018-05-21 11:57 ` [PATCH 20/33] video: fbdev: pxafb: use match_string() helper Yisheng Xie
2018-05-21 11:57 ` [PATCH 21/33] drm/nouveau: " Yisheng Xie
@ 2018-05-21 11:57 ` Yisheng Xie
2018-05-21 22:04 ` Andy Shevchenko
2018-05-21 11:58 ` [PATCH 23/33] drm: i2c: ch7006: " Yisheng Xie
2018-05-21 11:58 ` [PATCH 24/33] drm: " Yisheng Xie
4 siblings, 1 reply; 12+ messages in thread
From: Yisheng Xie @ 2018-05-21 11:57 UTC (permalink / raw)
To: linux-kernel
Cc: Yisheng Xie, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
David Airlie, intel-gfx, dri-devel
match_string() returns the index of an array for a matching string,
which can be used intead of open coded variant.
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: David Airlie <airlied@linux.ie>
Cc: intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
---
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 1f5cd57..f6b1335 100644
--- a/drivers/gpu/drm/i915/intel_pipe_crc.c
+++ b/drivers/gpu/drm/i915/intel_pipe_crc.c
@@ -764,13 +764,12 @@ enum intel_pipe_crc_object {
{
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 -EINVAL;
- return -EINVAL;
+ *o = i;
+ return 0;
}
static int display_crc_ctl_parse_pipe(struct drm_i915_private *dev_priv,
@@ -796,13 +795,12 @@ static int display_crc_ctl_parse_pipe(struct drm_i915_private *dev_priv,
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 -EINVAL;
- return -EINVAL;
+ *s = i;
+ return 0;
}
static int display_crc_ctl_parse(struct drm_i915_private *dev_priv,
--
1.7.12.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 22/33] drm/i915: use match_string() helper
2018-05-21 11:57 ` [PATCH 22/33] drm/i915: " Yisheng Xie
@ 2018-05-21 22:04 ` Andy Shevchenko
2018-05-22 8:36 ` Jani Nikula
0 siblings, 1 reply; 12+ messages in thread
From: Andy Shevchenko @ 2018-05-21 22:04 UTC (permalink / raw)
To: Yisheng Xie
Cc: David Airlie, intel-gfx, Linux Kernel Mailing List, dri-devel,
Rodrigo Vivi
On Mon, May 21, 2018 at 2:57 PM, Yisheng Xie <xieyisheng1@huawei.com> wrote:
> match_string() returns the index of an array for a matching string,
> which can be used intead of open coded variant.
https://patchwork.kernel.org/patch/10382323/
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: intel-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
--
With Best Regards,
Andy Shevchenko
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 22/33] drm/i915: use match_string() helper
2018-05-21 22:04 ` Andy Shevchenko
@ 2018-05-22 8:36 ` Jani Nikula
2018-05-22 9:22 ` Yisheng Xie
0 siblings, 1 reply; 12+ messages in thread
From: Jani Nikula @ 2018-05-22 8:36 UTC (permalink / raw)
To: Andy Shevchenko, Yisheng Xie
Cc: David Airlie, intel-gfx, Linux Kernel Mailing List, dri-devel,
Rodrigo Vivi
On Tue, 22 May 2018, Andy Shevchenko <andy.shevchenko@gmail.com> wrote:
> On Mon, May 21, 2018 at 2:57 PM, Yisheng Xie <xieyisheng1@huawei.com> wrote:
>> match_string() returns the index of an array for a matching string,
>> which can be used intead of open coded variant.
>
> https://patchwork.kernel.org/patch/10382323/
Even more convincingly,
47d4cb8ae8e7 ("i915: Convert to use match_string() helper")
BR,
Jani.
>
>> Cc: Jani Nikula <jani.nikula@linux.intel.com>
>> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Cc: David Airlie <airlied@linux.ie>
>> Cc: intel-gfx@lists.freedesktop.org
>> Cc: dri-devel@lists.freedesktop.org
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 22/33] drm/i915: use match_string() helper
2018-05-22 8:36 ` Jani Nikula
@ 2018-05-22 9:22 ` Yisheng Xie
0 siblings, 0 replies; 12+ messages in thread
From: Yisheng Xie @ 2018-05-22 9:22 UTC (permalink / raw)
To: Jani Nikula, Andy Shevchenko
Cc: David Airlie, intel-gfx, Linux Kernel Mailing List, dri-devel,
Rodrigo Vivi
Hi Jani,
On 2018/5/22 16:36, Jani Nikula wrote:
> On Tue, 22 May 2018, Andy Shevchenko <andy.shevchenko@gmail.com> wrote:
>> On Mon, May 21, 2018 at 2:57 PM, Yisheng Xie <xieyisheng1@huawei.com> wrote:
>>> match_string() returns the index of an array for a matching string,
>>> which can be used intead of open coded variant.
>>
>> https://patchwork.kernel.org/patch/10382323/
>
> Even more convincingly,
>
> 47d4cb8ae8e7 ("i915: Convert to use match_string() helper")
Sorry, but I will definitely remove them in next version, I just miss these.
Thanks
Yisheng
>
> BR,
> Jani.
>
>>
>>> Cc: Jani Nikula <jani.nikula@linux.intel.com>
>>> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>>> Cc: David Airlie <airlied@linux.ie>
>>> Cc: intel-gfx@lists.freedesktop.org
>>> Cc: dri-devel@lists.freedesktop.org
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 23/33] drm: i2c: ch7006: use match_string() helper
[not found] <1526903890-35761-1-git-send-email-xieyisheng1@huawei.com>
` (2 preceding siblings ...)
2018-05-21 11:57 ` [PATCH 22/33] drm/i915: " Yisheng Xie
@ 2018-05-21 11:58 ` Yisheng Xie
2018-05-21 11:58 ` [PATCH 24/33] drm: " Yisheng Xie
4 siblings, 0 replies; 12+ messages in thread
From: Yisheng Xie @ 2018-05-21 11:58 UTC (permalink / raw)
To: linux-kernel
Cc: Yisheng Xie, David Airlie, Daniel Vetter, Arvind Yadav, dri-devel
match_string() returns the index of an array for a matching string,
which can be used intead of open coded variant.
Cc: David Airlie <airlied@linux.ie>
Cc: Yisheng Xie <xieyisheng1@huawei.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Arvind Yadav <arvind.yadav.cs@gmail.com>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
---
drivers/gpu/drm/i2c/ch7006_drv.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c
index 544a8a2..405c7fb 100644
--- a/drivers/gpu/drm/i2c/ch7006_drv.c
+++ b/drivers/gpu/drm/i2c/ch7006_drv.c
@@ -464,14 +464,11 @@ static int ch7006_encoder_init(struct i2c_client *client,
priv->chip_version = ch7006_read(client, CH7006_VERSION_ID);
if (ch7006_tv_norm) {
- for (i = 0; i < NUM_TV_NORMS; i++) {
- if (!strcmp(ch7006_tv_norm_names[i], ch7006_tv_norm)) {
- priv->norm = i;
- break;
- }
- }
-
- if (i == NUM_TV_NORMS)
+ i = match_string(ch7006_tv_norm_names,
+ NUM_TV_NORMS, ch7006_tv_norm);
+ if (i >= 0)
+ priv->norm = i;
+ else
ch7006_err(client, "Invalid TV norm setting \"%s\".\n",
ch7006_tv_norm);
}
--
1.7.12.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 24/33] drm: use match_string() helper
[not found] <1526903890-35761-1-git-send-email-xieyisheng1@huawei.com>
` (3 preceding siblings ...)
2018-05-21 11:58 ` [PATCH 23/33] drm: i2c: ch7006: " Yisheng Xie
@ 2018-05-21 11:58 ` Yisheng Xie
2018-05-21 22:06 ` Andy Shevchenko
4 siblings, 1 reply; 12+ messages in thread
From: Yisheng Xie @ 2018-05-21 11:58 UTC (permalink / raw)
To: linux-kernel
Cc: Yisheng Xie, Gustavo Padovan, Maarten Lankhorst, Sean Paul,
David Airlie, dri-devel
match_string() returns the index of an array for a matching string,
which can be used intead of open coded variant.
Cc: Gustavo Padovan <gustavo@padovan.org>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: David Airlie <airlied@linux.ie>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
---
drivers/gpu/drm/drm_panel_orientation_quirks.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/drm_panel_orientation_quirks.c b/drivers/gpu/drm/drm_panel_orientation_quirks.c
index 902cc1a..3367c36 100644
--- a/drivers/gpu/drm/drm_panel_orientation_quirks.c
+++ b/drivers/gpu/drm/drm_panel_orientation_quirks.c
@@ -136,7 +136,6 @@ int drm_get_panel_orientation_quirk(int width, int height)
const struct dmi_system_id *match;
const struct drm_dmi_panel_orientation_data *data;
const char *bios_date;
- int i;
for (match = dmi_first_match(orientation_data);
match;
@@ -154,10 +153,8 @@ int drm_get_panel_orientation_quirk(int width, int height)
if (!bios_date)
continue;
- for (i = 0; data->bios_dates[i]; i++) {
- if (!strcmp(data->bios_dates[i], bios_date))
- return data->orientation;
- }
+ if (match_string(data->bios_dates, -1, bios_date) >= 0)
+ return data->orientation;
}
return DRM_MODE_PANEL_ORIENTATION_UNKNOWN;
--
1.7.12.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 24/33] drm: use match_string() helper
2018-05-21 11:58 ` [PATCH 24/33] drm: " Yisheng Xie
@ 2018-05-21 22:06 ` Andy Shevchenko
2018-05-22 8:39 ` Jani Nikula
0 siblings, 1 reply; 12+ messages in thread
From: Andy Shevchenko @ 2018-05-21 22:06 UTC (permalink / raw)
To: Yisheng Xie; +Cc: David Airlie, Linux Kernel Mailing List, dri-devel
On Mon, May 21, 2018 at 2:58 PM, Yisheng Xie <xieyisheng1@huawei.com> wrote:
> match_string() returns the index of an array for a matching string,
> which can be used intead of open coded variant.
https://patchwork.kernel.org/patch/10382377/
> Cc: Gustavo Padovan <gustavo@padovan.org>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Sean Paul <seanpaul@chromium.org>
> Cc: David Airlie <airlied@linux.ie>
> Cc: dri-devel@lists.freedesktop.org
--
With Best Regards,
Andy Shevchenko
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 24/33] drm: use match_string() helper
2018-05-21 22:06 ` Andy Shevchenko
@ 2018-05-22 8:39 ` Jani Nikula
0 siblings, 0 replies; 12+ messages in thread
From: Jani Nikula @ 2018-05-22 8:39 UTC (permalink / raw)
To: Andy Shevchenko, Yisheng Xie
Cc: David Airlie, Linux Kernel Mailing List, dri-devel
On Tue, 22 May 2018, Andy Shevchenko <andy.shevchenko@gmail.com> wrote:
> On Mon, May 21, 2018 at 2:58 PM, Yisheng Xie <xieyisheng1@huawei.com> wrote:
>> match_string() returns the index of an array for a matching string,
>> which can be used intead of open coded variant.
>
> https://patchwork.kernel.org/patch/10382377/
818c05d8e267 ("drm: panel-orientation-quirks: Convert to use match_string() helper")
BR,
Jani.
>
>> Cc: Gustavo Padovan <gustavo@padovan.org>
>> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>> Cc: Sean Paul <seanpaul@chromium.org>
>> Cc: David Airlie <airlied@linux.ie>
>> Cc: dri-devel@lists.freedesktop.org
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 12+ messages in thread