auxdisplay: Move ifwidth to struct hd44780_common

Move struct charlcd member ifwidth to our new struct hd44780_common.
ifwidth is hd44780 device specific and is used by two drivers at the
moment, so we move it to a common place, where both can use this.

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 02392336d7d3ad230b55b38af13184364d3d7bdb..59e0a815bf3d277c3b4486c9a7c817e0a5ed0be9 100644 (file)
--- a/drivers/auxdisplay/charlcd.c
+++ b/drivers/auxdisplay/charlcd.c
@@ -223,9 +223,10 @@ static int charlcd_init_display(struct charlcd *lcd)
 {
        void (*write_cmd_raw)(struct charlcd *lcd, int cmd);
        struct charlcd_priv *priv = charlcd_to_priv(lcd);
+       struct hd44780_common *hdc = lcd->drvdata;
        u8 init;
 
-       if (lcd->ifwidth != 4 && lcd->ifwidth != 8)
+       if (hdc->ifwidth != 4 && hdc->ifwidth != 8)
                return -EINVAL;
 
        priv->flags = ((lcd->height > 1) ? LCD_FLAG_N : 0) | LCD_FLAG_D |
@@ -238,7 +239,7 @@ static int charlcd_init_display(struct charlcd *lcd)
         * the LCD is in 8-bit mode afterwards
         */
        init = LCD_CMD_FUNCTION_SET | LCD_CMD_DATA_LEN_8BITS;
-       if (lcd->ifwidth == 4) {
+       if (hdc->ifwidth == 4) {
                init >>= 4;
                write_cmd_raw = lcd->ops->write_cmd_raw4;
        } else {
@@ -251,7 +252,7 @@ static int charlcd_init_display(struct charlcd *lcd)
        write_cmd_raw(lcd, init);
        long_sleep(10);
 
-       if (lcd->ifwidth == 4) {
+       if (hdc->ifwidth == 4) {
                /* Switch to 4-bit mode, 1 line, small fonts */
                lcd->ops->write_cmd_raw4(lcd, LCD_CMD_FUNCTION_SET >> 4);
                long_sleep(10);
@@ -260,7 +261,7 @@ static int charlcd_init_display(struct charlcd *lcd)
        /* set font height and lines number */
        lcd->ops->write_cmd(lcd,
                LCD_CMD_FUNCTION_SET |
-               ((lcd->ifwidth == 8) ? LCD_CMD_DATA_LEN_8BITS : 0) |
+               ((hdc->ifwidth == 8) ? LCD_CMD_DATA_LEN_8BITS : 0) |
                ((priv->flags & LCD_FLAG_F) ? LCD_CMD_FONT_5X10_DOTS : 0) |
                ((priv->flags & LCD_FLAG_N) ? LCD_CMD_TWO_LINES : 0));
        long_sleep(10);
@@ -543,7 +544,7 @@ static inline int handle_lcd_special_code(struct charlcd *lcd)
        else if ((oldflags ^ priv->flags) & (LCD_FLAG_F | LCD_FLAG_N))
                lcd->ops->write_cmd(lcd,
                        LCD_CMD_FUNCTION_SET |
-                       ((lcd->ifwidth == 8) ? LCD_CMD_DATA_LEN_8BITS : 0) |
+                       ((hdc->ifwidth == 8) ? LCD_CMD_DATA_LEN_8BITS : 0) |
                        ((priv->flags & LCD_FLAG_F) ? LCD_CMD_FONT_5X10_DOTS : 0) |
                        ((priv->flags & LCD_FLAG_N) ? LCD_CMD_TWO_LINES : 0));
        /* check whether L flag was changed */
@@ -794,7 +795,6 @@ struct charlcd *charlcd_alloc(void)
        priv->esc_seq.len = -1;
 
        lcd = &priv->lcd;
-       lcd->ifwidth = 8;
 
        return lcd;
 }

diff --git a/drivers/auxdisplay/charlcd.h b/drivers/auxdisplay/charlcd.h
index 2a12d07705a3428ab5a2eae18e5bdac6a430c6ab..5dce9dd36562a7d64ee5745980fd933f4d164e0e 100644 (file)
--- a/drivers/auxdisplay/charlcd.h
+++ b/drivers/auxdisplay/charlcd.h
@@ -18,7 +18,6 @@ struct charlcd {
        const struct charlcd_ops *ops;
        const unsigned char *char_conv; /* Optional */
 
-       int ifwidth;                    /* 4-bit or 8-bit (default) */
        int height;
        int width;
 

diff --git a/drivers/auxdisplay/hd44780.c b/drivers/auxdisplay/hd44780.c
index 0603af8f23360c148aceffcd6365b11c5e600758..f6786239c36f647b7c9b1dc30a3973ef759c1734 100644 (file)
--- a/drivers/auxdisplay/hd44780.c
+++ b/drivers/auxdisplay/hd44780.c
@@ -275,7 +275,7 @@ static int hd44780_probe(struct platform_device *pdev)
        /* Optional properties */
        device_property_read_u32(dev, "internal-buffer-width", &hdc->bwidth);
 
-       lcd->ifwidth = ifwidth;
+       hdc->ifwidth = ifwidth;
        lcd->ops = ifwidth == 8 ? &hd44780_ops_gpio8 : &hd44780_ops_gpio4;
 
        ret = charlcd_register(lcd);

diff --git a/drivers/auxdisplay/hd44780_common.c b/drivers/auxdisplay/hd44780_common.c
index 3a05fd30cae053afe37f4dacd71d36ce7e5d9929..4968461f0c4a09f3de1e56907fa756ac619f2a00 100644 (file)
--- a/drivers/auxdisplay/hd44780_common.c
+++ b/drivers/auxdisplay/hd44780_common.c
@@ -12,6 +12,7 @@ struct hd44780_common *hd44780_common_alloc(void)
        if (!hd)
                return NULL;
 
+       hd->ifwidth = 8;
        hd->bwidth = DEFAULT_LCD_BWIDTH;
        hd->hwidth = DEFAULT_LCD_HWIDTH;
        return hd;

diff --git a/drivers/auxdisplay/hd44780_common.h b/drivers/auxdisplay/hd44780_common.h
index 9647d24c44905df0c82e06ab92f45672b2f360ac..54cbe5a489d778083a9354dfd7c83152677aa4d2 100644 (file)
--- a/drivers/auxdisplay/hd44780_common.h
+++ b/drivers/auxdisplay/hd44780_common.h
@@ -4,6 +4,7 @@
 #define DEFAULT_LCD_HWIDTH      64
 
 struct hd44780_common {
+       int ifwidth;                    /* 4-bit or 8-bit (default) */
        int bwidth;                     /* Default set by hd44780_alloc() */
        int hwidth;                     /* Default set by hd44780_alloc() */
        void *hd44780;