linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: poeschel@lemonage.de
To: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>,
	linux-kernel@vger.kernel.org (open list)
Cc: Lars Poeschel <poeschel@lemonage.de>, Willy Tarreau <w@1wt.eu>
Subject: [PATCH v5 16/25] auxdisplay: cleanup unnecessary hd44780 code in charlcd
Date: Thu, 29 Oct 2020 10:57:20 +0100	[thread overview]
Message-ID: <20201029095731.311528-15-poeschel@lemonage.de> (raw)
In-Reply-To: <20201029095731.311528-1-poeschel@lemonage.de>

From: Lars Poeschel <poeschel@lemonage.de>

This cleans up now unnecessary hd44780 specific code from charlcd. We
obsoleted this with the last patch. So another chunk of hd44780 specific
code can be dropped from charlcd.

Reviewed-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Lars Poeschel <poeschel@lemonage.de>
---
Changes in v5:
- combined two cleanup patches
---
 drivers/auxdisplay/charlcd.c | 32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/drivers/auxdisplay/charlcd.c b/drivers/auxdisplay/charlcd.c
index 281a3259c144..29737c3e18f6 100644
--- a/drivers/auxdisplay/charlcd.c
+++ b/drivers/auxdisplay/charlcd.c
@@ -25,21 +25,8 @@
 /* Keep the backlight on this many seconds for each flash */
 #define LCD_BL_TEMPO_PERIOD	4
 
-/* LCD commands */
-#define LCD_CMD_DISPLAY_CTRL	0x08	/* Display control */
-#define LCD_CMD_DISPLAY_ON	0x04	/* Set display on */
-#define LCD_CMD_CURSOR_ON	0x02	/* Set cursor on */
-#define LCD_CMD_BLINK_ON	0x01	/* Set blink on */
-
-#define LCD_CMD_FUNCTION_SET	0x20	/* Set function */
-#define LCD_CMD_DATA_LEN_8BITS	0x10	/* Set data length to 8 bits */
-#define LCD_CMD_TWO_LINES	0x08	/* Set to two display lines */
-#define LCD_CMD_FONT_5X10_DOTS	0x04	/* Set char font to 5x10 dots */
-
 #define LCD_CMD_SET_CGRAM_ADDR	0x40	/* Set char generator RAM address */
 
-#define LCD_CMD_SET_DDRAM_ADDR 0x80    /* Set display data RAM address */
-
 #define LCD_ESCAPE_LEN		24	/* Max chars for LCD escape command */
 #define LCD_ESCAPE_CHAR		27	/* Use char 27 for escape command */
 
@@ -431,24 +418,7 @@ static inline int handle_lcd_special_code(struct charlcd *lcd)
 	if (oldflags == priv->flags)
 		return processed;
 
-	/* check whether one of B,C,D flags were changed */
-	if ((oldflags ^ priv->flags) &
-	    (LCD_FLAG_B | LCD_FLAG_C | LCD_FLAG_D))
-		/* set display mode */
-		hdc->write_cmd(hdc,
-			LCD_CMD_DISPLAY_CTRL |
-			((priv->flags & LCD_FLAG_D) ? LCD_CMD_DISPLAY_ON : 0) |
-			((priv->flags & LCD_FLAG_C) ? LCD_CMD_CURSOR_ON : 0) |
-			((priv->flags & LCD_FLAG_B) ? LCD_CMD_BLINK_ON : 0));
-	/* check whether one of F,N flags was changed */
-	else if ((oldflags ^ priv->flags) & (LCD_FLAG_F | LCD_FLAG_N))
-		hdc->write_cmd(hdc,
-			LCD_CMD_FUNCTION_SET |
-			((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 */
-	else if ((oldflags ^ priv->flags) & LCD_FLAG_L)
+	if ((oldflags ^ priv->flags) & LCD_FLAG_L)
 		charlcd_backlight(lcd, !!(priv->flags & LCD_FLAG_L));
 
 	return processed;
-- 
2.28.0


  parent reply	other threads:[~2020-10-29  9:58 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-29  9:52 [PATCH 00/25] Make charlcd device independent poeschel
2020-10-29  9:52 ` [PATCH v5 01/25] auxdisplay: Use an enum for charlcd backlight on/off ops poeschel
2020-10-29  9:57 ` [PATCH v5 02/25] auxdisplay: Introduce hd44780_common.[ch] poeschel
2020-10-29  9:57   ` [PATCH v5 03/25] auxdisplay: Move hwidth and bwidth to struct hd44780_common poeschel
2020-10-29  9:57   ` [PATCH v5 04/25] auxdisplay: Move ifwidth " poeschel
2020-10-29  9:57   ` [PATCH v5 05/25] auxdisplay: Move write_data pointer to hd44780_common poeschel
2020-10-29  9:57   ` [PATCH v5 06/25] auxdisplay: Move write_cmd pointers to hd44780 drivers poeschel
2020-10-29  9:57   ` [PATCH v5 07/25] auxdisplay: Move addr out of charlcd_priv poeschel
2020-10-29  9:57   ` [PATCH v5 08/25] auxdisplay: hd44780_common_print poeschel
2020-10-29  9:57   ` [PATCH v5 09/25] auxdisplay: provide hd44780_common_gotoxy poeschel
2020-10-29  9:57   ` [PATCH v5 10/25] auxdisplay: add home to charlcd_ops poeschel
2020-10-29  9:57   ` [PATCH v5 11/25] auxdisplay: Move clear_display to hd44780_common poeschel
2020-10-29  9:57   ` [PATCH v5 12/25] auxdisplay: make charlcd_backlight visible " poeschel
2020-10-29  9:57   ` [PATCH v5 13/25] auxdisplay: Make use of enum for backlight on / off poeschel
2020-10-29  9:57   ` [PATCH v5 14/25] auxdisplay: Move init_display to hd44780_common poeschel
2020-10-29  9:57   ` [PATCH v5 15/25] auxdisplay: implement various hd44780_common_ functions poeschel
2020-10-29  9:57   ` poeschel [this message]
2020-10-29  9:57   ` [PATCH v5 17/25] auxdisplay: Move char redefine code to hd44780_common poeschel
2020-10-29  9:57   ` [PATCH v5 18/25] auxdisplay: Call charlcd_backlight in place poeschel
2020-10-29  9:57   ` [PATCH v5 19/25] auxdisplay: hd44780_common: Reduce clear_display timeout poeschel
2020-10-29  9:57   ` [PATCH v5 20/25] auxdisplay: hd44780: Remove clear_fast poeschel
2020-10-29  9:57   ` [PATCH v5 21/25] auxdisplay: charlcd: replace last device specific stuff poeschel
2020-10-29  9:57   ` [PATCH v5 22/25] auxdisplay: Change gotoxy calling interface poeschel
2020-10-29  9:57   ` [PATCH v5 23/25] auxdisplay: charlcd: Do not print chars at end of line poeschel
2020-10-31  9:18     ` Miguel Ojeda
2020-10-31  9:26   ` [PATCH v5 02/25] auxdisplay: Introduce hd44780_common.[ch] Miguel Ojeda
2020-11-03  8:46     ` Lars Poeschel
2020-10-29 10:01 ` [PATCH v5 24/25] auxdisplay: lcd2s DT binding doc poeschel
2020-10-29 10:01   ` [PATCH v5 25/25] auxdisplay: add a driver for lcd2s character display poeschel
2020-10-31  9:30 ` [PATCH 00/25] Make charlcd device independent Miguel Ojeda

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201029095731.311528-15-poeschel@lemonage.de \
    --to=poeschel@lemonage.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=miguel.ojeda.sandonis@gmail.com \
    --cc=w@1wt.eu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).