[12/45] tty: vt: reflow csi_J()

Message ID	20240118075756.10541-13-jirislaby@kernel.org
State	Superseded
Headers	show Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 53EDC2575C; Thu, 18 Jan 2024 07:58:25 +0000 (UTC) From: "Jiri Slaby (SUSE)" <jirislaby@kernel.org> To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" <jirislaby@kernel.org> Subject: [PATCH 12/45] tty: vt: reflow csi_J() Date: Thu, 18 Jan 2024 08:57:23 +0100 Message-ID: <20240118075756.10541-13-jirislaby@kernel.org> In-Reply-To: <20240118075756.10541-1-jirislaby@kernel.org> References: <20240118075756.10541-1-jirislaby@kernel.org> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	tty: vt: cleanup and documentation \| expand [00/45] tty: vt: cleanup and documentation [01/45] vgacon: inline vc_scrolldelta_helper() into vgacon_scrolldelta() [02/45] fbcon: make display_desc a static array in fbcon_startup() [03/45] tty: vt: fix 20 vs 0x20 typo in EScsiignore [04/45] tty: vt: expect valid vc when in tty ops [05/45] tty: vt: pass proper pointers from tioclinux() [06/45] tty: vt: push console lock from tioclinux() down to 2 functions [07/45] tty: vt: pass vc_resize_user as a parameter [08/45] tty: vt: make vc_is_sel()'s vc const [09/45] tty: vt: define an enum for CSI+m codes [10/45] tty: vt: use case ranges for CSI+m fg/bg colors [11/45] tty: vt: define an enum for CSI+J codes [12/45] tty: vt: reflow csi_J() [13/45] tty: vt: define an enum for CSI+K codes [14/45] tty: vt: reflow csi_K() [15/45] tty: vt: pass vpar as unsigned to csi_J() and csi_K() [16/45] tty: vt: define an enum for ascii characters [17/45] tty: vt: remove extern from functions in selection.h [18/45] tty: vt: make consw::con_debug_() return void [19/45] tty: vt: make init parameter of consw::con_init() a bool [20/45] tty: vt: sanitize arguments of consw::con_clear() [21/45] tty: vt: remove checks for count in consw::con_clear() implementations [22/45] tty: vt: add con_putc() helper [23/45] tty: vt: eliminate unneeded consw::con_putc() implementations [24/45] tty: vt: sanitize consw::con_putc() parameters [25/45] tty: vt: sanitize consw::con_putcs() parameters [26/45] consoles: use if instead of switch-case in consw::con_cursor() [27/45] fbdev/core: simplify cursor_state setting in fbcon_ops::cursor() [28/45] tty: vt: remove CM_ constants [29/45] tty: vt: make consw::con_switch() return a bool [30/45] tty: vt: stop using -1 for blank mode in consw::con_blank() [31/45] tty: vt: use VESA blanking constants [32/45] tty: vt: use enum for VESA blanking modes [33/45] tty: vt: make types around consw::con_blank() bool [34/45] tty: vt: make font of consw::con_font_set() const [35/45] tty: vt: make consw::con_font_default()'s name const [36/45] tty: vt: change consw::con_set_origin() return type [37/45] fbcon: remove consw::con_screen_pos() [38/45] tty: vt: remove consw::con_screen_pos() [39/45] tty: vt: make types of screenpos() more consistent [40/45] fbcon: remove fbcon_getxy() [41/45] tty: vt: remove consw::con_getxy() [42/45] tty: vt: remove unused consw::con_flush_scrollback() [43/45] tty: vt: document the rest of struct consw [44/45] tty: vt: fix up kernel-doc [45/45] Documentation: add console.rst

Message ID

20240118075756.10541-13-jirislaby@kernel.org

State

Superseded

Headers

From: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
To: gregkh@linuxfoundation.org
Cc: linux-serial@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	"Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Subject: [PATCH 12/45] tty: vt: reflow csi_J()
Date: Thu, 18 Jan 2024 08:57:23 +0100
Message-ID: <20240118075756.10541-13-jirislaby@kernel.org>
In-Reply-To: <20240118075756.10541-1-jirislaby@kernel.org>
References: <20240118075756.10541-1-jirislaby@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

tty: vt: cleanup and documentation | expand

Commit Message

Jiri Slaby (SUSE) Jan. 18, 2024, 7:57 a.m. UTC

Push cases one level left, according to coding style. And reorder local
variables.

Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
---
 drivers/tty/vt/vt.c | 50 ++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 4f7831f81db6..22ef7366c155 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -1507,34 +1507,34 @@  enum {
 
 static void csi_J(struct vc_data *vc, int vpar)
 {
+	unsigned short *start;
 	unsigned int count;
-	unsigned short * start;
 
 	switch (vpar) {
-		case CSI_J_CURSOR_TO_END:
-			vc_uniscr_clear_line(vc, vc->state.x,
-					     vc->vc_cols - vc->state.x);
-			vc_uniscr_clear_lines(vc, vc->state.y + 1,
-					      vc->vc_rows - vc->state.y - 1);
-			count = (vc->vc_scr_end - vc->vc_pos) >> 1;
-			start = (unsigned short *)vc->vc_pos;
-			break;
-		case CSI_J_START_TO_CURSOR:
-			vc_uniscr_clear_line(vc, 0, vc->state.x + 1);
-			vc_uniscr_clear_lines(vc, 0, vc->state.y);
-			count = ((vc->vc_pos - vc->vc_origin) >> 1) + 1;
-			start = (unsigned short *)vc->vc_origin;
-			break;
-		case CSI_J_FULL:
-			flush_scrollback(vc);
-			fallthrough;
-		case CSI_J_VISIBLE:
-			vc_uniscr_clear_lines(vc, 0, vc->vc_rows);
-			count = vc->vc_cols * vc->vc_rows;
-			start = (unsigned short *)vc->vc_origin;
-			break;
-		default:
-			return;
+	case CSI_J_CURSOR_TO_END:
+		vc_uniscr_clear_line(vc, vc->state.x,
+				     vc->vc_cols - vc->state.x);
+		vc_uniscr_clear_lines(vc, vc->state.y + 1,
+				      vc->vc_rows - vc->state.y - 1);
+		count = (vc->vc_scr_end - vc->vc_pos) >> 1;
+		start = (unsigned short *)vc->vc_pos;
+		break;
+	case CSI_J_START_TO_CURSOR:
+		vc_uniscr_clear_line(vc, 0, vc->state.x + 1);
+		vc_uniscr_clear_lines(vc, 0, vc->state.y);
+		count = ((vc->vc_pos - vc->vc_origin) >> 1) + 1;
+		start = (unsigned short *)vc->vc_origin;
+		break;
+	case CSI_J_FULL:
+		flush_scrollback(vc);
+		fallthrough;
+	case CSI_J_VISIBLE:
+		vc_uniscr_clear_lines(vc, 0, vc->vc_rows);
+		count = vc->vc_cols * vc->vc_rows;
+		start = (unsigned short *)vc->vc_origin;
+		break;
+	default:
+		return;
 	}
 	scr_memsetw(start, vc->vc_video_erase_char, 2 * count);
 	if (con_should_update(vc))

[12/45] tty: vt: reflow csi_J()

Commit Message

Patch