p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auxdisplay: charlcd: deduplicate simple_strtoul() 

Like in commit 8b2303de39 ("serial: core: Fix handling of options
after MMIO address") we may use simple_strtoul() which in comparison to
kstrtoul() can do conversion in-place without additional and unnecessary
code to be written.

Link: http://lkml.kernel.org/r/20190801192904.41087-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Mans Rullgard <mans@mansr.com>
Cc: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andy Shevchenko 2019-12-04 16:50:36 -08:00 committed by Linus Torvalds
parent 885e68e8b7
commit d717e7da45
1 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/auxdisplay/charlcd.c
View File

@ -287,31 +287,6 @@ static int charlcd_init_display(struct charlcd *lcd)
return 0; return 0;
} }
/*
* Parses an unsigned integer from a string, until a non-digit character
* is found. The empty string is not accepted. No overflow checks are done.
*
* Returns whether the parsing was successful. Only in that case
* the output parameters are written to.
*
* TODO: If the kernel adds an inplace version of kstrtoul(), this function
* could be easily replaced by that.
*/
static bool parse_n(const char *s, unsigned long *res, const char **next_s)
{
if (!isdigit(*s))
return false;
*res = 0;
while (isdigit(*s)) {
*res = *res * 10 + (*s - '0');
++s;
}
*next_s = s;
return true;
}
/* /*
* Parses a movement command of the form "(.*);", where the group can be * Parses a movement command of the form "(.*);", where the group can be
* any number of subcommands of the form "(x|y)[0-9]+". * any number of subcommands of the form "(x|y)[0-9]+".
@ -336,6 +311,7 @@ static bool parse_xy(const char *s, unsigned long *x, unsigned long *y)
{ {
unsigned long new_x = *x; unsigned long new_x = *x;
unsigned long new_y = *y; unsigned long new_y = *y;
char *p;
for (;;) { for (;;) {
if (!*s) if (!*s)
@ -345,11 +321,15 @@ static bool parse_xy(const char *s, unsigned long *x, unsigned long *y)
break; break;
if (*s == 'x') { if (*s == 'x') {
if (!parse_n(s + 1, &new_x, &s)) new_x = simple_strtoul(s + 1, &p, 10);
if (p == s + 1)
return false; return false;
s = p;
} else if (*s == 'y') { } else if (*s == 'y') {
if (!parse_n(s + 1, &new_y, &s)) new_y = simple_strtoul(s + 1, &p, 10);
if (p == s + 1)
return false; return false;
s = p;
} else { } else {
return false; return false;
} }