auxdisplay: charlcd: replace last device specific stuff

These are the last bits left in charlcd.c that are device specific and
they are removed now.
In detail this is:
* bwidth, which is the width of the display buffer per line. This is
  replaced by width of the display.
* hwidth, which is the size of the display buffer as a whole. This is
  replaced by looping all chars of a line by all lines.
* the hd44780_common header include can go away.

Reviewed-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Lars Poeschel <poeschel@lemonage.de>
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>

diff --git a/drivers/auxdisplay/charlcd.c b/drivers/auxdisplay/charlcd.c
index 077c01e8712783c3baa48a2c870e85efb761d7cd..59f21401d6a9682da1057de0e5f77e49226aac3b 100644 (file)
--- a/drivers/auxdisplay/charlcd.c
+++ b/drivers/auxdisplay/charlcd.c
@@ -20,7 +20,6 @@
 #include <generated/utsrelease.h>
 
 #include "charlcd.h"
-#include "hd44780_common.h"
 
 /* Keep the backlight on this many seconds for each flash */
 #define LCD_BL_TEMPO_PERIOD    4
@@ -112,8 +111,6 @@ static void charlcd_home(struct charlcd *lcd)
 
 static void charlcd_print(struct charlcd *lcd, char c)
 {
-       struct hd44780_common *hdc = lcd->drvdata;
-
        if (lcd->char_conv)
                c = lcd->char_conv[(unsigned char)c];
 
@@ -121,7 +118,7 @@ static void charlcd_print(struct charlcd *lcd, char c)
                lcd->addr.x++;
 
        /* prevents the cursor from wrapping onto the next line */
-       if (lcd->addr.x == hdc->bwidth)
+       if (lcd->addr.x == lcd->width)
                lcd->ops->gotoxy(lcd);
 }
 
@@ -195,7 +192,6 @@ static bool parse_xy(const char *s, unsigned long *x, unsigned long *y)
 static inline int handle_lcd_special_code(struct charlcd *lcd)
 {
        struct charlcd_priv *priv = charlcd_to_priv(lcd);
-       struct hd44780_common *hdc = lcd->drvdata;
 
        /* LCD special codes */
 
@@ -323,7 +319,7 @@ static inline int handle_lcd_special_code(struct charlcd *lcd)
 
                xs = lcd->addr.x;
                ys = lcd->addr.y;
-               for (x = lcd->addr.x; x < hdc->bwidth; x++)
+               for (x = lcd->addr.x; x < lcd->width; x++)
                        lcd->ops->print(lcd, ' ');
 
                /* restore cursor position */
@@ -366,7 +362,6 @@ static inline int handle_lcd_special_code(struct charlcd *lcd)
 static void charlcd_write_char(struct charlcd *lcd, char c)
 {
        struct charlcd_priv *priv = charlcd_to_priv(lcd);
-       struct hd44780_common *hdc = lcd->drvdata;
 
        /* first, we'll test if we're in escape mode */
        if ((c != '\n') && priv->esc_seq.len >= 0) {
@@ -407,7 +402,7 @@ static void charlcd_write_char(struct charlcd *lcd, char c)
                         * flush the remainder of the current line and
                         * go to the beginning of the next line
                         */
-                       for (; lcd->addr.x < hdc->bwidth; lcd->addr.x++)
+                       for (; lcd->addr.x < lcd->width; lcd->addr.x++)
                                lcd->ops->print(lcd, ' ');
 
                        lcd->addr.x = 0;