[PATCH 2/2] x86/boot: Use bool and IS_ENABLED() in query_edd()
From: Thorsten Blum
Date: Tue Aug 04 2026 - 08:03:42 EST
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 <thorsten.blum@xxxxxxxxx>
---
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");