summaryrefslogtreecommitdiff
path: root/drivers/auxdisplay
diff options
context:
space:
mode:
authorLars Poeschel <poeschel@lemonage.de>2020-11-16 16:41:21 +0300
committerMiguel Ojeda <ojeda@kernel.org>2020-11-16 19:13:37 +0300
commit351dcacc6d774258be9fec6f51c14f8ff38243f6 (patch)
tree6386f065bbff992d51a36021f23e0b9b7c8f0716 /drivers/auxdisplay
parent32d917e754bdc322e22439f6ce400a1a74bbdc6e (diff)
downloadlinux-351dcacc6d774258be9fec6f51c14f8ff38243f6.tar.xz
auxdisplay: panel: Remove redundant charlcd_ops structures
The three struct charlcd_ops contain the same data, so we only need one of this structures. The other two are removed. Signed-off-by: Lars Poeschel <poeschel@lemonage.de> Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
Diffstat (limited to 'drivers/auxdisplay')
-rw-r--r--drivers/auxdisplay/panel.c42
1 files changed, 4 insertions, 38 deletions
diff --git a/drivers/auxdisplay/panel.c b/drivers/auxdisplay/panel.c
index 36848e464d1f..ff5755ee5694 100644
--- a/drivers/auxdisplay/panel.c
+++ b/drivers/auxdisplay/panel.c
@@ -808,41 +808,7 @@ static void lcd_write_data_tilcd(struct hd44780_common *hdc, int data)
spin_unlock_irq(&pprt_lock);
}
-static const struct charlcd_ops charlcd_serial_ops = {
- .backlight = lcd_backlight,
- .print = hd44780_common_print,
- .gotoxy = hd44780_common_gotoxy,
- .home = hd44780_common_home,
- .clear_display = hd44780_common_clear_display,
- .init_display = hd44780_common_init_display,
- .shift_cursor = hd44780_common_shift_cursor,
- .shift_display = hd44780_common_shift_display,
- .display = hd44780_common_display,
- .cursor = hd44780_common_cursor,
- .blink = hd44780_common_blink,
- .fontsize = hd44780_common_fontsize,
- .lines = hd44780_common_lines,
- .redefine_char = hd44780_common_redefine_char,
-};
-
-static const struct charlcd_ops charlcd_parallel_ops = {
- .backlight = lcd_backlight,
- .print = hd44780_common_print,
- .gotoxy = hd44780_common_gotoxy,
- .home = hd44780_common_home,
- .clear_display = hd44780_common_clear_display,
- .init_display = hd44780_common_init_display,
- .shift_cursor = hd44780_common_shift_cursor,
- .shift_display = hd44780_common_shift_display,
- .display = hd44780_common_display,
- .cursor = hd44780_common_cursor,
- .blink = hd44780_common_blink,
- .fontsize = hd44780_common_fontsize,
- .lines = hd44780_common_lines,
- .redefine_char = hd44780_common_redefine_char,
-};
-
-static const struct charlcd_ops charlcd_tilcd_ops = {
+static const struct charlcd_ops charlcd_ops = {
.backlight = lcd_backlight,
.print = hd44780_common_print,
.gotoxy = hd44780_common_gotoxy,
@@ -984,7 +950,7 @@ static void lcd_init(void)
charlcd->height = DEFAULT_LCD_HEIGHT;
if (lcd.proto == LCD_PROTO_SERIAL) { /* SERIAL */
- charlcd->ops = &charlcd_serial_ops;
+ charlcd->ops = &charlcd_ops;
hdc->write_data = lcd_write_data_s;
hdc->write_cmd = lcd_write_cmd_s;
@@ -994,7 +960,7 @@ static void lcd_init(void)
lcd.pins.da = DEFAULT_LCD_PIN_SDA;
} else if (lcd.proto == LCD_PROTO_PARALLEL) { /* PARALLEL */
- charlcd->ops = &charlcd_parallel_ops;
+ charlcd->ops = &charlcd_ops;
hdc->write_data = lcd_write_data_p8;
hdc->write_cmd = lcd_write_cmd_p8;
@@ -1005,7 +971,7 @@ static void lcd_init(void)
if (lcd.pins.rw == PIN_NOT_SET)
lcd.pins.rw = DEFAULT_LCD_PIN_RW;
} else {
- charlcd->ops = &charlcd_tilcd_ops;
+ charlcd->ops = &charlcd_ops;
hdc->write_data = lcd_write_data_tilcd;
hdc->write_cmd = lcd_write_cmd_tilcd;
}