[PATCH v1] video: fbdev: pxafb: Convert to use match_string() helper

[PATCH v1] video: fbdev: pxafb: Convert to use match_string() helper

[Andy Shevchenko]

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/video/fbdev/pxafb.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c
index c3d49e13643c..0c013f1efe81 100644
--- a/drivers/video/fbdev/pxafb.c
+++ b/drivers/video/fbdev/pxafb.c
@@ -2099,7 +2099,7 @@ static void pxafb_check_options(struct device *dev, struct pxafb_mach_info *inf)
 
 #if defined(CONFIG_OF)
 static const char * const lcd_types[] = {
-	"unknown", "mono-stn", "mono-dstn", "color-stn", "color-dstn",
+	"mono-stn", "mono-dstn", "color-stn", "color-dstn",
 	"color-tft", "smart-panel", NULL
 };
 
@@ -2115,12 +2115,10 @@ 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;
+		return i;
 	}
 	info->lcd_conn |= LCD_CONN_TYPE(i);
 	info->lcd_conn |= LCD_CONN_WIDTH(bus_width);
-- 
2.17.0

Re: [PATCH v1] video: fbdev: pxafb: Convert to use match_string() helper

[Bartlomiej Zolnierkiewicz]

On Thursday, May 03, 2018 09:04:23 PM Andy Shevchenko 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>

Patch queued for 4.18, thanks.

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

Re: [PATCH v1] video: fbdev: pxafb: Convert to use match_string() helper

[Andy Shevchenko]

On Tue, 2018-05-15 at 12:37 +0200, Bartlomiej Zolnierkiewicz wrote:
> On Thursday, May 03, 2018 09:04:23 PM Andy Shevchenko 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>
> 
> Patch queued for 4.18, thanks.

I went through it again and found a bug, the type "unknown" should be
left untouched.

-- 
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy

Re: [PATCH v1] video: fbdev: pxafb: Convert to use match_string() helper

[Bartlomiej Zolnierkiewicz]

On Tuesday, May 15, 2018 02:35:03 PM Andy Shevchenko wrote:
> On Tue, 2018-05-15 at 12:37 +0200, Bartlomiej Zolnierkiewicz wrote:
> > On Thursday, May 03, 2018 09:04:23 PM Andy Shevchenko 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>
> > 
> > Patch queued for 4.18, thanks.
> 
> I went through it again and found a bug, the type "unknown" should be
> left untouched.

Indeed, could you provide incremental fix?

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

Re: [PATCH v1] video: fbdev: pxafb: Convert to use match_string() helper

[Andy Shevchenko]

On Tue, 2018-05-15 at 13:54 +0200, Bartlomiej Zolnierkiewicz wrote:
> On Tuesday, May 15, 2018 02:35:03 PM Andy Shevchenko wrote:
> > On Tue, 2018-05-15 at 12:37 +0200, Bartlomiej Zolnierkiewicz wrote:
> > > On Thursday, May 03, 2018 09:04:23 PM Andy Shevchenko 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.co
> > > > m>
> > > 
> > > Patch queued for 4.18, thanks.
> > 
> > I went through it again and found a bug, the type "unknown" should
> > be
> > left untouched.
> 
> Indeed, could you provide incremental fix?

Is it late enough to drop patch completely? If so, I do a fix asap.

-- 
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy

Re: [PATCH v1] video: fbdev: pxafb: Convert to use match_string() helper

[Bartlomiej Zolnierkiewicz]

On Tuesday, May 15, 2018 02:59:20 PM Andy Shevchenko wrote:
> On Tue, 2018-05-15 at 13:54 +0200, Bartlomiej Zolnierkiewicz wrote:
> > On Tuesday, May 15, 2018 02:35:03 PM Andy Shevchenko wrote:
> > > On Tue, 2018-05-15 at 12:37 +0200, Bartlomiej Zolnierkiewicz wrote:
> > > > On Thursday, May 03, 2018 09:04:23 PM Andy Shevchenko 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.co
> > > > > m>
> > > > 
> > > > Patch queued for 4.18, thanks.
> > > 
> > > I went through it again and found a bug, the type "unknown" should
> > > be
> > > left untouched.
> > 
> > Indeed, could you provide incremental fix?
> 
> Is it late enough to drop patch completely? If so, I do a fix asap.

It is already merged in publicly available tree (which is not being
rebased) so it is too late to drop it completely.

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

Re: [PATCH v1] video: fbdev: pxafb: Convert to use match_string() helper

[Bartlomiej Zolnierkiewicz]

On Tuesday, May 15, 2018 02:17:35 PM Bartlomiej Zolnierkiewicz wrote:
> On Tuesday, May 15, 2018 02:59:20 PM Andy Shevchenko wrote:
> > On Tue, 2018-05-15 at 13:54 +0200, Bartlomiej Zolnierkiewicz wrote:
> > > On Tuesday, May 15, 2018 02:35:03 PM Andy Shevchenko wrote:
> > > > On Tue, 2018-05-15 at 12:37 +0200, Bartlomiej Zolnierkiewicz wrote:
> > > > > On Thursday, May 03, 2018 09:04:23 PM Andy Shevchenko 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.co
> > > > > > m>
> > > > > 
> > > > > Patch queued for 4.18, thanks.
> > > > 
> > > > I went through it again and found a bug, the type "unknown" should
> > > > be
> > > > left untouched.
> > > 
> > > Indeed, could you provide incremental fix?
> > 
> > Is it late enough to drop patch completely? If so, I do a fix asap.
> 
> It is already merged in publicly available tree (which is not being
> rebased) so it is too late to drop it completely.

OK, I fixed it myself with the patch below.

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics


From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Subject: [PATCH] video: fbdev: pxafb: match_string() conversion fixup

"unknown" lcd_types[] entry is needed for proper operation of
the driver, add it back.

Fixes: 6d09dfe70f8f ("video: fbdev: pxafb: Convert to use match_string() helper")
Reported-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Arvind Yadav <arvind.yadav.cs@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
---
 drivers/video/fbdev/pxafb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: b/drivers/video/fbdev/pxafb.c
=================================--- a/drivers/video/fbdev/pxafb.c	2018-05-15 17:41:00.922315366 +0200
+++ b/drivers/video/fbdev/pxafb.c	2018-05-15 17:42:27.474317546 +0200
@@ -2099,7 +2099,7 @@ static void pxafb_check_options(struct d
 
 #if defined(CONFIG_OF)
 static const char * const lcd_types[] = {
-	"mono-stn", "mono-dstn", "color-stn", "color-dstn",
+	"unknown", "mono-stn", "mono-dstn", "color-stn", "color-dstn",
 	"color-tft", "smart-panel", NULL
 };
 

Re: [PATCH v1] video: fbdev: pxafb: Convert to use match_string() helper

[Andy Shevchenko]

On Tue, 2018-05-15 at 18:06 +0200, Bartlomiej Zolnierkiewicz wrote:
> On Tuesday, May 15, 2018 02:17:35 PM Bartlomiej Zolnierkiewicz wrote:
> > On Tuesday, May 15, 2018 02:59:20 PM Andy Shevchenko wrote:

> > It is already merged in publicly available tree (which is not being
> > rebased) so it is too late to drop it completely.

Oh, sorry for that.

> OK, I fixed it myself with the patch below.
> 

> From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> Subject: [PATCH] video: fbdev: pxafb: match_string() conversion fixup
> 
> "unknown" lcd_types[] entry is needed for proper operation of
> the driver, add it back.

Yes, that's correct now.

I was thinking that we perhaps add a comment that the list of these
names should be in sync with definitions in the header.

-- 
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy