Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp1583200pxb; Tue, 8 Feb 2022 23:06:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJyqkgHNXdhqxMxx17qMJVk7EBw2FmLvro81VQN1QLpgmNBIhCMAqAgcukV4KDSvxZK5tXha X-Received: by 2002:a65:6e04:: with SMTP id bd4mr808554pgb.375.1644390393013; Tue, 08 Feb 2022 23:06:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644390393; cv=none; d=google.com; s=arc-20160816; b=nj5uodPlGOKLikkvUodz3EzJAf3HVxm0rPdFLiULt2IDmpINha7lHmjApUiVLZ+vWF ZfVVrXacTL0PEpybRBV15ZBYun3RUXcR+iEZfnZEFAzMuOiuaWytFeqOtMFKUD8EpxQX FLIxG+DluXSrvtPa591VDQY6nIPbw+KVaV17LExHyKa+PS0DiAVD861UqQ5uPjUIxWTw Eue7A9nJA00YrTgvXRqLJ1lcK/vLxZsicuZZk/ukGG99pC0MidW99bfIONgHcN/5mVr0 9ox63CGJxSdoQw3LsJ2aJmE3B0fNnscSNOujP1uijSasth1RxR/0G5VTvKY9AO/Ap6kV IOzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=gS4cB1np1M5WffNPCk4lBUp+Ft8dXY94oZrLVYHaHIU=; b=dFXt3XqGvFvEluF0gQZYzsnQQm0VhsAE3gmeEQV8806CU8gCKUe9FcJGdSOXLoNjoF qTGZLph6FzQDDXaAOWPUoxT5MgBtA9HQ2md/TjVVWh5nTtpdAJB/qGgG7oCxycV3+1F/ hCH0K6d8XFWZRJG1zR2TJlL0klOvtgmuVJZ3C4uSr10Ej5Uo8jnQiXdvWF7pmeKLjGh9 fa4bWcdXr4ZBGvP248+ednx8Kq5s3Fh3CpLQ2lIKi76n4BSGTRplIRwy10TeOFb6IkrN /aX07c8QkC5aNyIckb2Ztr1BQWjy37Dog2CGFa4TT0w4zyT8dv46I+5oSDVmQfQSsXwY /lhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ffwll.ch header.s=google header.b=POlHKow3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q12si3103410pfs.185.2022.02.08.23.06.20; Tue, 08 Feb 2022 23:06:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ffwll.ch header.s=google header.b=POlHKow3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1387659AbiBHW0B (ORCPT + 99 others); Tue, 8 Feb 2022 17:26:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1386717AbiBHVIp (ORCPT ); Tue, 8 Feb 2022 16:08:45 -0500 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0171C0612BC for ; Tue, 8 Feb 2022 13:08:44 -0800 (PST) Received: by mail-wm1-x32f.google.com with SMTP id l12-20020a7bc34c000000b003467c58cbdfso1996783wmj.2 for ; Tue, 08 Feb 2022 13:08:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gS4cB1np1M5WffNPCk4lBUp+Ft8dXY94oZrLVYHaHIU=; b=POlHKow3MVpKZFu37kNTQBf60vXI/Bdf0/kdIpeZxBk+FetbUOq7GWpdR/E7ywdHH6 6A8znecVyMGtnphv3jPdoQeC1TZW2v3uwbFzVY/WoLwOj8AtjmVGu62bi97NgT0FawcD T1Dvp2sActs5q6ehz/awhILYoFHe66ZE+SqPM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gS4cB1np1M5WffNPCk4lBUp+Ft8dXY94oZrLVYHaHIU=; b=qLTzqJSq4Azr/5ciU0xB0oh9Sp5YVZlHdEKJyAaxxkv3I/NCblrBYCWKgQyHzIMl5v cwEjc0SDlMOLzWvQ4iclRNhi+leNAOLSiJyg3JtYXxUSXhzYokQde/z8CzbTooPsnxcF ZS4O2o3HrjQWvWATRsH/RanfepoKHjUQJednde6mfqVXD+KtX9Cejv1kDdX1hRlkKA+7 vJxvKdAt/kxCjlPYwyqLXo/p98u+KGfgNclJn5RHwtNf0DCbqn1JBovRyCoxreZUcnuH 6KGh3Sij12D3a65V0vPb9oMajVHaFfpxcANwVjDZVymScPBbCsIguISeXZZxcoEbXngt 6roQ== X-Gm-Message-State: AOAM533YrghMFzqoOlj88yKBjphAxdSgSd1ZG3e6wry6g6LMsqJY55sE AYESCV3eIc4pCzvoHwiGINi5kw== X-Received: by 2002:a05:600c:3505:: with SMTP id h5mr2617699wmq.122.1644354523501; Tue, 08 Feb 2022 13:08:43 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id o14sm3033561wmr.3.2022.02.08.13.08.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Feb 2022 13:08:42 -0800 (PST) From: Daniel Vetter To: DRI Development Cc: Intel Graphics Development , linux-fbdev@vger.kernel.org, LKML , Daniel Vetter , Thomas Zimmermann , Sam Ravnborg , Daniel Vetter , Daniel Vetter , Tetsuo Handa , Greg Kroah-Hartman , Du Cheng , Claudio Suarez Subject: [PATCH v2 07/19] fbcon: Replace FBCON_FLAGS_INIT with a boolean Date: Tue, 8 Feb 2022 22:08:12 +0100 Message-Id: <20220208210824.2238981-8-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220208210824.2238981-1-daniel.vetter@ffwll.ch> References: <20220208210824.2238981-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It's only one flag and slightly tidier code. Acked-by: Thomas Zimmermann Acked-by: Sam Ravnborg Signed-off-by: Daniel Vetter Cc: Daniel Vetter Cc: Tetsuo Handa Cc: Greg Kroah-Hartman Cc: Du Cheng Cc: Thomas Zimmermann Cc: Claudio Suarez --- drivers/video/fbdev/core/fbcon.c | 11 +++++------ drivers/video/fbdev/core/fbcon.h | 4 +--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index a368ed602e2e..058e885d24f6 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -775,7 +775,7 @@ static void con2fb_init_display(struct vc_data *vc, struct fb_info *info, ops->currcon = fg_console; - if (info->fbops->fb_set_par && !(ops->flags & FBCON_FLAGS_INIT)) { + if (info->fbops->fb_set_par && !ops->initialized) { ret = info->fbops->fb_set_par(info); if (ret) @@ -784,7 +784,7 @@ static void con2fb_init_display(struct vc_data *vc, struct fb_info *info, "error code %d\n", ret); } - ops->flags |= FBCON_FLAGS_INIT; + ops->initialized = true; ops->graphics = 0; fbcon_set_disp(info, &info->var, unit); @@ -1103,8 +1103,7 @@ static void fbcon_init(struct vc_data *vc, int init) * We need to do it in fbcon_init() to prevent screen corruption. */ if (con_is_visible(vc) && vc->vc_mode == KD_TEXT) { - if (info->fbops->fb_set_par && - !(ops->flags & FBCON_FLAGS_INIT)) { + if (info->fbops->fb_set_par && !ops->initialized) { ret = info->fbops->fb_set_par(info); if (ret) @@ -1113,7 +1112,7 @@ static void fbcon_init(struct vc_data *vc, int init) "error code %d\n", ret); } - ops->flags |= FBCON_FLAGS_INIT; + ops->initialized = true; } ops->graphics = 0; @@ -1186,7 +1185,7 @@ static void fbcon_deinit(struct vc_data *vc) if (con_is_visible(vc)) fbcon_del_cursor_work(info); - ops->flags &= ~FBCON_FLAGS_INIT; + ops->initialized = false; finished: fbcon_free_font(p, free_font); diff --git a/drivers/video/fbdev/core/fbcon.h b/drivers/video/fbdev/core/fbcon.h index 6708ca0048aa..0eaf54a21151 100644 --- a/drivers/video/fbdev/core/fbcon.h +++ b/drivers/video/fbdev/core/fbcon.h @@ -18,8 +18,6 @@ #include -#define FBCON_FLAGS_INIT 1 - /* * This is the interface between the low-level console driver and the * low-level frame buffer device @@ -79,7 +77,7 @@ struct fbcon_ops { int blank_state; int graphics; int save_graphics; /* for debug enter/leave */ - int flags; + bool initialized; int rotate; int cur_rotate; char *cursor_data; -- 2.34.1