diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2020-05-18 22:36:17 +0300 |
|---|---|---|
| committer | Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> | 2020-05-29 23:33:50 +0200 |
| commit | 3f03b64981723b61048ea46642bcaa9b518f3ad3 (patch) | |
| tree | d90419af531eb9940790a7a094aecf87b1aa3eae | |
| parent | 9cb1fd0efd195590b828b9b865421ad345a4a145 (diff) | |
auxdisplay: charlcd: Reuse hex_to_bin() instead of custom code
hex_to_bin() may be used to convert hexdecimal digit to its binary
representation.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
| -rw-r--r-- | drivers/auxdisplay/charlcd.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/auxdisplay/charlcd.c b/drivers/auxdisplay/charlcd.c index d58278ae9e4a..5aee0f546351 100644 --- a/drivers/auxdisplay/charlcd.c +++ b/drivers/auxdisplay/charlcd.c @@ -485,24 +485,19 @@ static inline int handle_lcd_special_code(struct charlcd *lcd) shift = 0; value = 0; while (*esc && cgoffset < 8) { + int half; + shift ^= 4; - if (*esc >= '0' && *esc <= '9') { - value |= (*esc - '0') << shift; - } else if (*esc >= 'A' && *esc <= 'F') { - value |= (*esc - 'A' + 10) << shift; - } else if (*esc >= 'a' && *esc <= 'f') { - value |= (*esc - 'a' + 10) << shift; - } else { - esc++; + + half = hex_to_bin(*esc++); + if (half < 0) continue; - } + value |= half << shift; if (shift == 0) { cgbytes[cgoffset++] = value; value = 0; } - - esc++; } lcd->ops->write_cmd(lcd, LCD_CMD_SET_CGRAM_ADDR | (cgaddr * 8)); |