From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-182.mta0.migadu.com (out-182.mta0.migadu.com [91.218.175.182]) (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 4BDBC381AEF for ; Tue, 4 Aug 2026 11:53:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785844415; cv=none; b=QyDGsas9NC1Frg2bkDAMFBBqaosIPtS37r6NQWRw8pdR4ZyEhG2nNtFiUGox51pLagKiKVC8qw+j5J87gifdnqVvzUYGWUSGpfkhwySrKfBjEs+H+OZUlzXARAfsIiAMCW19CUIsuVKEGDe9xQqtKtMQwRvHdPlU7zTESJ0W0PA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785844415; c=relaxed/simple; bh=tvRtK0eNIgyf1fno+TXvA6aoNjnrv8nY0TUCWzd9bEw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L880jmQFITFDV61T8H64enMaJNax1sm6z98pfJ3yBViMZAeufJTvd10H6ugHA8vcIERXMJCWXvVx6Jt+Xmhoy2hEyu8DRpLvp+Fa2QyejDtv17cWPrR5Zwkd/MuMQYGf3IFsqyIE0wSIFyFAnFes2gpxMkavL+zvhK7Z7Z8qvfM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=wfvjK7z1; arc=none smtp.client-ip=91.218.175.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="wfvjK7z1" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1785844411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lpLgU8zs0pGYrwvQqqSBFLmCUBL2FZG89/WRtQlVZ1k=; b=wfvjK7z1LtqDicx4wbTLPnZB2nKxmQfgwVJGdGU8H6RcHIwtw6eBtBaONXFe0m0K3Zqw8o Qy65Nb1G2AS4T8JR0UDGg3LKTHAocnemmRCWo+pU5hhQETwccwiGXX6N2SftC3GCWJ7L1a sB9FM8GTDD/hlOjBK2eESxvlEHnFxao= From: Thorsten Blum To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" Cc: Thorsten Blum , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] x86/boot: Use bool and IS_ENABLED() in query_edd() Date: Tue, 4 Aug 2026 13:52:26 +0200 Message-ID: <20260804115227.62158-5-thorsten.blum@linux.dev> In-Reply-To: <20260804115227.62158-4-thorsten.blum@linux.dev> References: <20260804115227.62158-4-thorsten.blum@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1259; i=thorsten.blum@linux.dev; h=from:subject; bh=tvRtK0eNIgyf1fno+TXvA6aoNjnrv8nY0TUCWzd9bEw=; b=owGbwMvMwCUWt7pQ4caZUj3G02pJDFmFl5oyNgg/qVjX0SmxnnEzQ/jhO2128fqfQ1sUQtfGr xavEiztKGVhEONikBVTZHkw68cM39Kayk0mETth5rAygQxh4OIUgImUtjL8lfA7fTSy8+GnWfa1 /H4JLM9z74g+9/m8fUqtxVZ7tvn7FRgZOgz8QjbcK9qwfsoMg6mfvz1U3JC0/8FTt+lGz8ptbs7 i5QMA X-Developer-Key: i=thorsten.blum@linux.dev; a=openpgp; fpr=1D60735E8AEF3BE473B69D84733678FD8DFEEAD4 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT In query_edd(), use bool for do_edd and initialize it directly from CONFIG_EDD_OFF via IS_ENABLED(). Also use bool for do_mbr and be_quiet. Signed-off-by: Thorsten Blum --- arch/x86/boot/edd.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/arch/x86/boot/edd.c b/arch/x86/boot/edd.c index 97cad16f6bf2..9956c611574b 100644 --- a/arch/x86/boot/edd.c +++ b/arch/x86/boot/edd.c @@ -120,26 +120,22 @@ static int get_edd_info(u8 devno, struct edd_info *ei) void query_edd(void) { char eddarg[8]; - int do_mbr = 1; -#ifdef CONFIG_EDD_OFF - int do_edd = 0; -#else - int do_edd = 1; -#endif - int be_quiet; + bool do_mbr = true; + bool do_edd = !IS_ENABLED(CONFIG_EDD_OFF); + bool be_quiet; int devno; struct edd_info ei, *edp; u32 *mbrptr; if (cmdline_find_option("edd", eddarg, sizeof(eddarg)) > 0) { if (!strcmp(eddarg, "skipmbr") || !strcmp(eddarg, "skip")) { - do_edd = 1; - do_mbr = 0; + do_edd = true; + do_mbr = false; } else if (!strcmp(eddarg, "off")) - do_edd = 0; + do_edd = false; else if (!strcmp(eddarg, "on")) - do_edd = 1; + do_edd = true; } be_quiet = cmdline_find_option_bool("quiet");