From patchwork Thu Mar 2 13:11:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Makarov X-Patchwork-Id: 94779 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp156166qgd; Thu, 2 Mar 2017 05:15:45 -0800 (PST) X-Received: by 10.98.144.22 with SMTP id a22mr15671516pfe.160.1488460545037; Thu, 02 Mar 2017 05:15:45 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p67si7435871pfb.136.2017.03.02.05.15.44; Thu, 02 Mar 2017 05:15:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752938AbdCBNPd (ORCPT + 25 others); Thu, 2 Mar 2017 08:15:33 -0500 Received: from mail-lf0-f52.google.com ([209.85.215.52]:33494 "EHLO mail-lf0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752883AbdCBNP2 (ORCPT ); Thu, 2 Mar 2017 08:15:28 -0500 Received: by mail-lf0-f52.google.com with SMTP id a6so33462017lfa.0 for ; Thu, 02 Mar 2017 05:15:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=e7pf7RM8jn55qXpwCWDlTjK2RW7rh4DjxEXexeBIep8=; b=P87D9UroD9dyjkmfxqWl2iDsKQFD70p4V3e1EuEvN0vPWZtE7pMybIYhBoGDrHIP09 DtAoqRfLzDyCvkqDRHOav481NqBorKdtBYKcoBMpWV2z7+0yYQFXMSvSw6F4QMdLpy6p HSAlZyNf4Wlp1x82ACa0qhRv1EBQnFONPeVt8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=e7pf7RM8jn55qXpwCWDlTjK2RW7rh4DjxEXexeBIep8=; b=XJZ/TK7mSBQBFdPOvdyXWm+baTNSaPoAGoxDxdf+1p80AAxq41XmgGFh9HV66kXI2v d53NdRoxruBkJVtYQXbtSrmigK8pNB56hWgoVGytX8NAHLihCotsaYWjzA8LJcb3E6zJ a/UnnwxCKUIS2ajBq/pZzNdrTSY6MVl49SD77lUCaQTMcvbi6M+mYtU0ODEwEwzFeF2R PaVRrzIIy9q91i9YWxntbHg7jJehQnvAslBSIS/VBLlF9o5oeeqFisqNy/GMl97LzXss fJDv2jM5IQCkTYI04VkMEMq8wnU3IzIMPpnwkLEclsqNNJyodt6/3QqPGs5MN9hqNHTL ZJ1w== X-Gm-Message-State: AMke39k+E7HlxEfCI5VQoZUQoTPo13e42Dm2FznKTj85dzO9eQxXNg4gTMix/5/iX/jND982 X-Received: by 10.25.79.69 with SMTP id a5mr4439646lfk.58.1488460520886; Thu, 02 Mar 2017 05:15:20 -0800 (PST) Received: from localhost.localdomain (nivc-213.auriga.ru. [80.240.102.213]) by smtp.gmail.com with ESMTPSA id c69sm1696062lfe.23.2017.03.02.05.15.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Mar 2017 05:15:20 -0800 (PST) From: Aleksey Makarov To: linux-serial@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Aleksey Makarov , Sudeep Holla , Greg Kroah-Hartman , Peter Hurley , Jiri Slaby , Robin Murphy , Steven Rostedt , "Nair, Jayachandran" , Petr Mladek , Sergey Senozhatsky Subject: [PATCH v2 1/3] printk: fix name/type/scope of preferred_console var Date: Thu, 2 Mar 2017 16:11:32 +0300 Message-Id: <20170302131153.22733-2-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170302131153.22733-1-aleksey.makarov@linaro.org> References: <20170302131153.22733-1-aleksey.makarov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The variable preferred_console is used only inside register_console() and its semantics is boolean. It is negative when no console has been made preferred. Make it static bool and rename to has_preferred. Renaming was suggested by Peter Hurley Signed-off-by: Aleksey Makarov --- kernel/printk/printk.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.11.1 Reviewed-by: Steven Rostedt (VMware) Reviewed-by: Sergey Senozhatsky diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 34da86e73d00..3c2234f21291 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -268,7 +268,6 @@ static struct console *exclusive_console; static struct console_cmdline console_cmdline[MAX_CMDLINECONSOLES]; static int selected_console = -1; -static int preferred_console = -1; int console_set_on_cmdline; EXPORT_SYMBOL(console_set_on_cmdline); @@ -2406,6 +2405,7 @@ void register_console(struct console *newcon) unsigned long flags; struct console *bcon = NULL; struct console_cmdline *c; + static bool has_preferred; if (console_drivers) for_each_console(bcon) @@ -2432,15 +2432,15 @@ void register_console(struct console *newcon) if (console_drivers && console_drivers->flags & CON_BOOT) bcon = console_drivers; - if (preferred_console < 0 || bcon || !console_drivers) - preferred_console = selected_console; + if (!has_preferred || bcon || !console_drivers) + has_preferred = selected_console >= 0; /* * See if we want to use this console driver. If we * didn't select a console we take the first one * that registers here. */ - if (preferred_console < 0) { + if (!has_preferred) { if (newcon->index < 0) newcon->index = 0; if (newcon->setup == NULL || @@ -2448,7 +2448,7 @@ void register_console(struct console *newcon) newcon->flags |= CON_ENABLED; if (newcon->device) { newcon->flags |= CON_CONSDEV; - preferred_console = 0; + has_preferred = true; } } } @@ -2483,7 +2483,7 @@ void register_console(struct console *newcon) newcon->flags |= CON_ENABLED; if (i == selected_console) { newcon->flags |= CON_CONSDEV; - preferred_console = selected_console; + has_preferred = true; } break; }