treewide: replace or remove redundant def_bool in Kconfig files

'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 <masahiroy@kernel.org>

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 5c845e8d59d92f8cd3594fccf1476503d8957149..03ce7e185935371a99c9003bdfe7b970974888f0 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -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
@@ -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.
 

diff --git a/arch/riscv/kernel/tests/Kconfig.debug b/arch/riscv/kernel/tests/Kconfig.debug
index 5dba64e8e977cdeab7340f023ffa2656b24636e0..78cea5d2c27022fc74ea5e9f9c1b5956f64314af 100644 (file)
--- a/arch/riscv/kernel/tests/Kconfig.debug
+++ b/arch/riscv/kernel/tests/Kconfig.debug
@@ -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.
 

diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
index 87e3da7b0439790dac6b35aa4f95e8e7573284d7..d72be552c86dcede446dac7f3a7b9b8ef6fd6ab1 100644 (file)
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@ -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

diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
index a65fc2ae15b4965b12862c3becf25e65e1b0fad7..77e788e928cd4e8d07ca867bd9e2337ea57c90df 100644 (file)
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@ -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.
 

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 3c3f8037ebedddbbfa756f52c98fd209053559c7..8ce591679d50e9a2d18decb2c6dbd9dc8d6e4bb4 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -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

diff --git a/drivers/iommu/intel/Kconfig b/drivers/iommu/intel/Kconfig
index 012cd2541a68a62b8360591f2c680fe14104eec1..95d9f4e1a17626c2dba01a093d3a7076b227076c 100644 (file)
--- a/drivers/iommu/intel/Kconfig
+++ b/drivers/iommu/intel/Kconfig
@@ -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

diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index a743e2c572fc86dc6ecdc8cb1b5d494a40c36bb7..0392154bbcab821bdf3c78534d73517d2d959b49 100644 (file)
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -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

diff --git a/init/Kconfig b/init/Kconfig
index 8426d59cc634d6dc86cc9954072a425b277c24ea..a4b80754e5807dc06a46bc14c146a9baec2f1f8a 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -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

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 975a07f9f1cc08838d272f83d5f04a85ff2f5cd2..e9b3b9543661f1fd7ecbbf87c450265558324a56 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -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
 

diff --git a/mm/Kconfig b/mm/Kconfig
index ffc3a2ba3a8cd85e2e6d95606bcab1510ce0d679..4914eb3216fccec7bf352a67c3f9d1e9ad17acf0 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -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
@@ -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
@@ -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
@@ -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

diff --git a/net/dccp/ccids/Kconfig b/net/dccp/ccids/Kconfig
index a3eeb84d16f9c6d5f110cb8a811f66b3e626ae06..e3d388c33d256c3733e2f432b451961afee39661 100644 (file)
--- a/net/dccp/ccids/Kconfig
+++ b/net/dccp/ccids/Kconfig
@@ -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