Received: by 2002:a05:7412:ba23:b0:fa:4c10:6cad with SMTP id jp35csp190705rdb; Thu, 18 Jan 2024 00:01:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IE2psmR9epw+CN7eb2+/pvec2+tW2r0lGwFEPDNnX8OBbqfcf5oBOmgsX5R/COAKEUFtkeu X-Received: by 2002:a1f:cc04:0:b0:4b6:c3ae:97f6 with SMTP id c4-20020a1fcc04000000b004b6c3ae97f6mr277749vkg.0.1705564885362; Thu, 18 Jan 2024 00:01:25 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705564885; cv=pass; d=google.com; s=arc-20160816; b=ihxQ9rAwBCVmbKljvj23cqBGTDQM3mAEPvzTOgtpOh2gOAYq5gyZtS1r6Yom+BX1yP p57hfnmInPYUomwLf+G0up59WVSCyTf+uDesiLOWltm7gjk6ibQ1CYHagWnbAoqyjUb7 5p2Fib69QK5yIm32Un9RETstkZwRKMuBmR54gnHMREycNdANj+cP+bnNm5o0hahAlm0G 7x42z6JxggGrrfPcc3OTA9NXbfZFab5Qy3Fydij0vr5nDTWybUjh7abMNovxRpj7INK/ gW+VQb52oO83uM6WfXAc9oIy8Mu9GKLJkYtF4qcNDVRknWFKyVDGTy+qhgK6IPsAQm/A xGuQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=NJm7tzKF7n74zYTrM3z1L20vfQO+4M6N34ogGLp6eHc=; fh=1YNwm5KBWetjB3qGkhgLqh/dZnCTsWuqRk83JW6hjgE=; b=FFLIMFV+cZtFnaEHR2PaSMEBVIHGFOo1Lm5DCdxlnQ+AlBWMXpmzYej3Aia/kIAGPa zrRULlXaH/xYoxe4o1ggP8fM1SaARe75Tgeqz0qiArez0frUqQ8X0UuVHPvnWJDfv5Kw Aal1HKIFJKkD+T/5yV5jh9yXKfphb0uZhujbCE9thGm/wqas/LEbWIKhvJvdt923TDYW RBoFRYn94mtMsPmwpinoJGcIxk1HBdAW8PtMXa/sONSr6majbP0/gtKHwXkIk1iFakMG 1rdNnRAP+eaWhkEmEAGHtsYl03UR9ZRwAnVr0Vpr4g0+TDRPUmEiokupgULU+6NyIAEF vtTg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="DH/8RpQ6"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-29799-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-29799-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id o5-20020a0c8c45000000b0067f032d7c53si8865946qvb.112.2024.01.18.00.01.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 00:01:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-29799-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="DH/8RpQ6"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-29799-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-29799-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 1E3BB1C227E8 for ; Thu, 18 Jan 2024 08:01:25 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2AAEA125AD; Thu, 18 Jan 2024 07:58:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DH/8RpQ6" 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) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705564706; cv=none; b=PxMzHGTDraHOxoO/aT98VIGzppZLS0kLj8X76yidIBCCrflUw+H3etXz8hYYa+LKDfzmsbWdSqvy93JwuBiZC4x/TcGtZ/fD5oKQXCN1rIOWBBc6FXEVpKDD7VryuX/9B6U6nZnkVTnFrOuhdBPRlh86s3LbjltuC2u85UJY/1U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705564706; c=relaxed/simple; bh=QRYobT/Ntnc2Q+TR1Sf0nMM7PfTjMjX2jtpPvm5til4=; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; b=WV5iQu5SfyXaYKEIj4fhTz+5Jsv7+GPsrgXauEtsMX5sYFM3wVba5yh3VRGIDZJiviLcpcG/a3IcU69IWfhfx7ZfY9om2uMTHtEF0HnYpNm6itFJ6l0vMflZkY+5yTHORieiJiJ42ywc1JSsu98LACu6Ok0PjlYPHBkDhpJZBxI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DH/8RpQ6; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1AD15C433F1; Thu, 18 Jan 2024 07:58:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705564705; bh=QRYobT/Ntnc2Q+TR1Sf0nMM7PfTjMjX2jtpPvm5til4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DH/8RpQ6P0bni7Ix6C1TZiX9PgzPgAEm5EGhjBJMYmAEfnEUUotzqq3BuXc6vRvSZ 8Jlu5hG5+gvnJ57EkVddMW/UprITM1++eFvATQ2MpKU02LB/LyWf7uSmZwOUaMQ0Tf 3IDRogfHAHUr8sB7jR3wdlPmFyspdwIwN/oM4VEz6du1oHKwQnyz8QMkSN6DprcmzA sWuSuNga1Qy2BI/TOOKmh92OAvZkde4XiTTEvs2r0d4EvLr1T57GV4PNEcu/+1Vl6T dgKfyKqTXrEDYEevmf8CFAdWj7yRfvakDEHLJtZpeFsPIKQleDjZWR+teKsH0QRtbm gpYgiMv7a/fWw== From: "Jiri Slaby (SUSE)" To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" 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> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240118075756.10541-1-jirislaby@kernel.org> References: <20240118075756.10541-1-jirislaby@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Push cases one level left, according to coding style. And reorder local variables. Signed-off-by: Jiri Slaby (SUSE) --- 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)) -- 2.43.0