From nobody Mon Feb 9 00:47:06 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 961E4EB64DD for ; Tue, 1 Aug 2023 05:50:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230462AbjHAFuG (ORCPT ); Tue, 1 Aug 2023 01:50:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229853AbjHAFuC (ORCPT ); Tue, 1 Aug 2023 01:50:02 -0400 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFC271B5 for ; Mon, 31 Jul 2023 22:50:00 -0700 (PDT) X-UUID: 9054b2f60eab4b43857b0fb9bd83da1f-20230801 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.28,REQID:498e93cb-fd92-42ee-9948-d809f92b89bb,IP:5,U RL:0,TC:0,Content:0,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:15 X-CID-INFO: VERSION:1.1.28,REQID:498e93cb-fd92-42ee-9948-d809f92b89bb,IP:5,URL :0,TC:0,Content:0,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:15 X-CID-META: VersionHash:176cd25,CLOUDID:be2f03b4-a467-4aa9-9e04-f584452e3794,B ulkID:230801134938TNI2A0GN,BulkQuantity:0,Recheck:0,SF:24|17|19|44|102,TC: nil,Content:0,EDM:5,IP:-2,URL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI :0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR,TF_CID_SPAM_FAS,TF_CID_SPAM_FSD,TF_CID_SPAM_FSI X-UUID: 9054b2f60eab4b43857b0fb9bd83da1f-20230801 X-User: oushixiong@kylinos.cn Received: from localhost.localdomain [(111.48.58.12)] by mailgw (envelope-from ) (Generic MTA) with ESMTP id 527254953; Tue, 01 Aug 2023 13:49:35 +0800 From: oushixiong To: Greg Kroah-Hartman Cc: Jiri Slaby , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Samuel Thibault , Daniel Vetter , linux-kernel@vger.kernel.org, oushixiong Subject: [PATCH] tty: vt: Remove some repetitive initialization Date: Tue, 1 Aug 2023 13:49:33 +0800 Message-Id: <20230801054933.895780-1-oushixiong@kylinos.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Some members of struct vc_data have been initialized in the vc_visual(), so it no longer to initialized them in vc_init(). Signed-off-by: oushixiong --- drivers/tty/vt/vt.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index 1e8e57b45688..cf77011a8f4e 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -140,8 +140,7 @@ EXPORT_SYMBOL(vc_cons); static const struct consw *con_driver_map[MAX_NR_CONSOLES]; =20 static int con_open(struct tty_struct *, struct file *); -static void vc_init(struct vc_data *vc, unsigned int rows, - unsigned int cols, int do_clear); +static void vc_init(struct vc_data *vc, int do_clear); static void gotoxy(struct vc_data *vc, int new_x, int new_y); static void save_cur(struct vc_data *vc); static void reset_terminal(struct vc_data *vc, int do_clear); @@ -1103,7 +1102,7 @@ int vc_allocate(unsigned int currcons) /* return 0 on= success */ if (global_cursor_default =3D=3D -1) global_cursor_default =3D 1; =20 - vc_init(vc, vc->vc_rows, vc->vc_cols, 1); + vc_init(vc, 1); vcs_make_sysfs(currcons); atomic_notifier_call_chain(&vt_notifier_list, VT_ALLOCATE, ¶m); =20 @@ -3398,16 +3397,10 @@ module_param_named(color, default_color, int, S_IRU= GO | S_IWUSR); module_param_named(italic, default_italic_color, int, S_IRUGO | S_IWUSR); module_param_named(underline, default_underline_color, int, S_IRUGO | S_IW= USR); =20 -static void vc_init(struct vc_data *vc, unsigned int rows, - unsigned int cols, int do_clear) +static void vc_init(struct vc_data *vc, int do_clear) { int j, k ; =20 - vc->vc_cols =3D cols; - vc->vc_rows =3D rows; - vc->vc_size_row =3D cols << 1; - vc->vc_screenbuf_size =3D vc->vc_rows * vc->vc_size_row; - set_origin(vc); vc->vc_pos =3D vc->vc_origin; reset_vc(vc); @@ -3475,8 +3468,7 @@ static int __init con_init(void) visual_init(vc, currcons, 1); /* Assuming vc->vc_{cols,rows,screenbuf_size} are sane here. */ vc->vc_screenbuf =3D kzalloc(vc->vc_screenbuf_size, GFP_NOWAIT); - vc_init(vc, vc->vc_rows, vc->vc_cols, - currcons || !vc->vc_sw->con_save_screen); + vc_init(vc, currcons || !vc->vc_sw->con_save_screen); } currcons =3D fg_console =3D 0; master_display_fg =3D vc =3D vc_cons[currcons].d; --=20 2.25.1 No virus found Checked by Hillstone Network AntiVirus