github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-24 06:24:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

x86/boot: Use IS_ENABLED() to simplify built-in-or-module checks

Browse Source 
Replace open-coded built-in-or-module checks for CONFIG_APM, CONFIG_EDD,
and CONFIG_X86_SPEEDSTEP_SMI with IS_ENABLED().

No change in functionality intended.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://patch.msgid.link/20260804115227.62158-4-thorsten.blum@linux.dev
This commit is contained in:
Thorsten Blum 2026-08-04 13:52:25 +02:00 committed by Ingo Molnar
parent 10a357ce44
commit 2ea3973d4f
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/boot/edd.c
View File

@ -15,7 +15,7 @@
#include <linux/edd.h>
#include "string.h"
#if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
#if IS_ENABLED(CONFIG_EDD)
/*
* Read the MBR (first sector) from a specific device.

10
arch/x86/boot/main.c
View File

@ -164,14 +164,12 @@ void main(void)
query_ist();
/* Query APM information */
#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
query_apm_bios();
#endif
if (IS_ENABLED(CONFIG_APM))
query_apm_bios();
/* Query EDD information */
#if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
query_edd();
#endif
if (IS_ENABLED(CONFIG_EDD))
query_edd();
/* Set the video mode */
set_video();

5
arch/x86/kernel/setup.c
View File

@ -120,8 +120,7 @@ struct cpuinfo_x86 new_cpu_data;
struct apm_info apm_info;
EXPORT_SYMBOL(apm_info);
#if defined(CONFIG_X86_SPEEDSTEP_SMI) || \
defined(CONFIG_X86_SPEEDSTEP_SMI_MODULE)
#if IS_ENABLED(CONFIG_X86_SPEEDSTEP_SMI)
struct ist_info ist_info;
EXPORT_SYMBOL(ist_info);
#else
@ -230,7 +229,7 @@ char builtin_cmdline[COMMAND_LINE_SIZE] = CONFIG_CMDLINE;
bool builtin_cmdline_added __ro_after_init;
#endif
#if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
#if IS_ENABLED(CONFIG_EDD)
struct edd edd;
#ifdef CONFIG_EDD_MODULE
EXPORT_SYMBOL(edd);