Skip to content

Commit

Permalink
treewide: replace or remove redundant def_bool in Kconfig files
Browse files Browse the repository at this point in the history
'def_bool X' is a shorthand for 'bool' plus 'default X'.

'def_bool' is redundant where 'bool' is already present, so 'def_bool X'
can be replaced with 'default X', or removed if X is 'n'.

Signed-off-by: Masahiro Yamada <[email protected]>
  • Loading branch information
masahir0y committed Feb 20, 2024
1 parent 91b6945 commit cd14b01
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 15 deletions.
4 changes: 2 additions & 2 deletions arch/parisc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,9 @@ config PARISC_HUGE_KERNEL
def_bool y if !MODULES || UBSAN || FTRACE || COMPILE_TEST

config MLONGCALLS
def_bool y if PARISC_HUGE_KERNEL
bool "Enable the -mlong-calls compiler option for big kernels" if !PARISC_HUGE_KERNEL
depends on PA8X00
default PARISC_HUGE_KERNEL
help
If you configure the kernel to include many drivers built-in instead
as modules, the kernel executable may become too big, so that the
Expand All @@ -254,9 +254,9 @@ config MLONGCALLS
Enabling this option will probably slow down your kernel.

config 64BIT
def_bool y if "$(ARCH)" = "parisc64"
bool "64-bit kernel" if "$(ARCH)" = "parisc"
depends on PA8X00
default "$(ARCH)" = "parisc64"
help
Enable this if you want to support 64bit kernel on PA-RISC platform.

Expand Down
2 changes: 1 addition & 1 deletion arch/riscv/kernel/tests/Kconfig.debug
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ config AS_HAS_ULEB128

menuconfig RUNTIME_KERNEL_TESTING_MENU
bool "arch/riscv/kernel runtime Testing"
def_bool y
default y
help
Enable riscv kernel runtime testing.

Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kvm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ config KVM_AMD
will be called kvm-amd.

config KVM_AMD_SEV
def_bool y
bool "AMD Secure Encrypted Virtualization (SEV) support"
default y
depends on KVM_AMD && X86_64
depends on CRYPTO_DEV_SP_PSP && !(KVM_AMD=y && CRYPTO_DEV_CCP_DD=m)
help
Expand Down
1 change: 0 additions & 1 deletion arch/x86/xen/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ config XEN_PVH
bool "Xen PVH guest support"
depends on XEN && XEN_PVHVM && ACPI
select PVH
def_bool n
help
Support for running as a Xen PVH guest.

Expand Down
1 change: 0 additions & 1 deletion drivers/acpi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,6 @@ config ACPI_BGRT

config ACPI_REDUCED_HARDWARE_ONLY
bool "Hardware-reduced ACPI support only" if EXPERT
def_bool n
help
This config item changes the way the ACPI code is built. When this
option is selected, the kernel will use a specialized version of
Expand Down
2 changes: 1 addition & 1 deletion drivers/iommu/intel/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ config INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON
the default value.

config INTEL_IOMMU_PERF_EVENTS
def_bool y
bool "Intel IOMMU performance events"
default y
depends on INTEL_IOMMU && PERF_EVENTS
help
Selecting this option will enable the performance monitoring
Expand Down
1 change: 0 additions & 1 deletion drivers/md/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,6 @@ config DM_VERITY
If unsure, say N.

config DM_VERITY_VERIFY_ROOTHASH_SIG
def_bool n
bool "Verity data device root hash signature verification support"
depends on DM_VERITY
select SYSTEM_DATA_VERIFICATION
Expand Down
2 changes: 1 addition & 1 deletion init/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1504,7 +1504,7 @@ config MULTIUSER

config SGETMASK_SYSCALL
bool "sgetmask/ssetmask syscalls support" if EXPERT
def_bool PARISC || M68K || PPC || MIPS || X86 || SPARC || MICROBLAZE || SUPERH
default PARISC || M68K || PPC || MIPS || X86 || SPARC || MICROBLAZE || SUPERH
help
sys_sgetmask and sys_ssetmask are obsolete system calls
no longer supported in libc but still enabled by default in some
Expand Down
2 changes: 1 addition & 1 deletion lib/Kconfig.debug
Original file line number Diff line number Diff line change
Expand Up @@ -2127,7 +2127,7 @@ config KCOV_IRQ_AREA_SIZE

menuconfig RUNTIME_TESTING_MENU
bool "Runtime Testing"
def_bool y
default y

if RUNTIME_TESTING_MENU

Expand Down
7 changes: 3 additions & 4 deletions mm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ config MEMORY_BALLOON
# support for memory balloon compaction
config BALLOON_COMPACTION
bool "Allow for balloon memory compaction/migration"
def_bool y
default y
depends on COMPACTION && MEMORY_BALLOON
help
Memory fragmentation introduced by ballooning might reduce
Expand All @@ -614,7 +614,7 @@ config BALLOON_COMPACTION
# support for memory compaction
config COMPACTION
bool "Allow for memory compaction"
def_bool y
default y
select MIGRATION
depends on MMU
help
Expand All @@ -637,7 +637,6 @@ config COMPACT_UNEVICTABLE_DEFAULT
# support for free page reporting
config PAGE_REPORTING
bool "Free page reporting"
def_bool n
help
Free page reporting allows for the incremental acquisition of
free pages from the buddy allocator for the purpose of reporting
Expand All @@ -649,7 +648,7 @@ config PAGE_REPORTING
#
config MIGRATION
bool "Page migration"
def_bool y
default y
depends on (NUMA || ARCH_ENABLE_MEMORY_HOTREMOVE || COMPACTION || CMA) && MMU
help
Allows the migration of the physical location of pages of processes
Expand Down
2 changes: 1 addition & 1 deletion net/dccp/ccids/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ config IP_DCCP_CCID2_DEBUG

config IP_DCCP_CCID3
bool "CCID-3 (TCP-Friendly)"
def_bool y if (IP_DCCP = y || IP_DCCP = m)
default IP_DCCP = y || IP_DCCP = m
help
CCID-3 denotes TCP-Friendly Rate Control (TFRC), an equation-based
rate-controlled congestion control mechanism. TFRC is designed to
Expand Down

0 comments on commit cd14b01

Please sign in to comment.