From nobody Fri Oct 2 06:18:06 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 B4B6E32B126; Tue, 4 Aug 2026 17:58:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785866293; cv=none; b=ck+YqPZsEvP+GvY/8BeDW2kaBydE+f1I/Yxjao+7P+N6aJMJbxV9s4IL3JUC1LpRicKoLt6soJ9hQrLKmp4XBW0E3xLxcnk/4/AKFjQJZc2FiSKg4s8TvBuWVAxkAr4ZISu9xR+x4aSdWclbT9jAbaqOvrWRb8EXw/zl6V3hFNg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785866293; c=relaxed/simple; bh=yQYKc/q1JnnpY1ZIw7mWFhRFZQdYWnOj0Xt2+tGHWJc=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=EX41RS0FyOkXLu/klhEgCrvfizK8drA2llwsxcxqPYOpj8lyJfcVXOefK0bt7NN5RyG1xsMGqwUIjjHlnaRphUbxwt3trFHlYrpFIa/cHDTgwSzpWdoTQfOoGswP2Jwxd7ujCcUpTvPb3H1IOQbE7wlh35Q9+otDIYv2Hvl1Rgg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=v4aUqVR3; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=8fsphHaf; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="v4aUqVR3"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="8fsphHaf" Date: Tue, 04 Aug 2026 17:58:07 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1785866289; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xzQRLaurKkNZx209b7ayLN7fKOnGrjgeKVFk7+ExGGw=; b=v4aUqVR30/hrrAXkgEZoRCFLMlHGrXdPea7KqBOUNjV2FdTCw/1vAfQkVxOVYwXJ+59Wz8 vrAipBuG18qaCa1idc32YTz2M4GyEWx6oZZuR4A91CCIqjgEcIpMIAd+Q645kjqw3+qUVU /Scl8umlzoXdYyEc9YkHtCR1xBgjJlcy3Iat5buWo1Ds0glGR0XFFEWCloSpZA5KvvcH2d Nw/+28YBAKDFd4HjpgjcAaRGQyDmXZsHRUs1MIpa6Y6QwFUlJKa+0JfDkTaNdP23Dh5soY kHeg+M1frmJLd9Wr4w5VWawtS+NblGO9mDyQ7sh+zh9Biudhiv+l4IH0L1JNQg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1785866289; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xzQRLaurKkNZx209b7ayLN7fKOnGrjgeKVFk7+ExGGw=; b=8fsphHafgodbLJl8E+1javsJiAHJm9Jtirjp7/Z+rheNtzMw5QaWMgLhWBBkGmX1sX+nbQ HSlTK421tQAZywCg== From: "tip-bot2 for Thorsten Blum" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/boot] x86/boot: Use bool and IS_ENABLED() to simplify query_edd() Cc: Thorsten Blum , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260804115227.62158-5-thorsten.blum@linux.dev> References: <20260804115227.62158-5-thorsten.blum@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178586628746.1210945.1116192059718626747.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the x86/boot branch of tip: Commit-ID: 2082fec6d4c65b4031dc82daa10cc9a5d35654c9 Gitweb: https://git.kernel.org/tip/2082fec6d4c65b4031dc82daa10cc9a5d= 35654c9 Author: Thorsten Blum AuthorDate: Tue, 04 Aug 2026 13:52:26 +02:00 Committer: Ingo Molnar CommitterDate: Tue, 04 Aug 2026 19:45:55 +02:00 x86/boot: Use bool and IS_ENABLED() to simplify query_edd() 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. No change in functionality intended. Signed-off-by: Thorsten Blum Signed-off-by: Ingo Molnar Link: https://patch.msgid.link/20260804115227.62158-5-thorsten.blum@linux.d= ev --- 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 97cad16..9956c61 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 =3D 1; -#ifdef CONFIG_EDD_OFF - int do_edd =3D 0; -#else - int do_edd =3D 1; -#endif - int be_quiet; + bool do_mbr =3D true; + bool do_edd =3D !IS_ENABLED(CONFIG_EDD_OFF); + bool be_quiet; int devno; struct edd_info ei, *edp; u32 *mbrptr; =20 if (cmdline_find_option("edd", eddarg, sizeof(eddarg)) > 0) { if (!strcmp(eddarg, "skipmbr") || !strcmp(eddarg, "skip")) { - do_edd =3D 1; - do_mbr =3D 0; + do_edd =3D true; + do_mbr =3D false; } else if (!strcmp(eddarg, "off")) - do_edd =3D 0; + do_edd =3D false; else if (!strcmp(eddarg, "on")) - do_edd =3D 1; + do_edd =3D true; } =20 be_quiet =3D cmdline_find_option_bool("quiet");