From 031ba1fd9172dba01e0193b1d047a2af4868a101 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 12 Apr 2019 12:13:02 +0200 Subject: [PATCH] staging: remove redundant 'default n' from Kconfig 'default n' is the default value for any bool or tristate Kconfig setting so there is no need to write it explicitly. Also since commit f467c5640c29 ("kconfig: only write '# CONFIG_FOO is not set' for visible symbols") the Kconfig behavior is the same regardless of 'default n' being present or not: ... One side effect of (and the main motivation for) this change is making the following two definitions behave exactly the same: config FOO bool config FOO bool default n With this change, neither of these will generate a '# CONFIG_FOO is not set' line (assuming FOO isn't selected/implied). That might make it clearer to people that a bare 'default n' is redundant. ... Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Greg Kroah-Hartman --- drivers/staging/Kconfig | 1 - drivers/staging/android/Kconfig | 2 -- drivers/staging/axis-fifo/Kconfig | 1 - drivers/staging/gs_fpgaboot/Kconfig | 1 - drivers/staging/media/rockchip/vpu/Kconfig | 1 - drivers/staging/rtl8192e/Kconfig | 1 - drivers/staging/wilc1000/Kconfig | 1 - drivers/staging/wlan-ng/Kconfig | 1 - 8 files changed, 9 deletions(-) diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 6319369cca89..55bc4f2926b1 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 menuconfig STAGING bool "Staging drivers" - default n ---help--- This option allows you to select a number of drivers that are not of the "normal" Linux kernel quality level. These drivers diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig index e02026999161..d6d605d5cbde 100644 --- a/drivers/staging/android/Kconfig +++ b/drivers/staging/android/Kconfig @@ -5,7 +5,6 @@ if ANDROID config ASHMEM bool "Enable the Anonymous Shared Memory Subsystem" - default n depends on SHMEM help The ashmem subsystem is a new shared memory allocator, similar to @@ -17,7 +16,6 @@ config ASHMEM config ANDROID_VSOC tristate "Android Virtual SoC support" - default n depends on PCI_MSI help This option adds support for the Virtual SoC driver needed to boot diff --git a/drivers/staging/axis-fifo/Kconfig b/drivers/staging/axis-fifo/Kconfig index 89e0d4db808d..3fffe4d6f327 100644 --- a/drivers/staging/axis-fifo/Kconfig +++ b/drivers/staging/axis-fifo/Kconfig @@ -5,7 +5,6 @@ config XIL_AXIS_FIFO tristate "Xilinx AXI-Stream FIFO IP core driver" depends on OF - default n help This adds support for the Xilinx AXI-Stream FIFO IP core driver. The AXI Streaming FIFO allows memory mapped access to a AXI Streaming diff --git a/drivers/staging/gs_fpgaboot/Kconfig b/drivers/staging/gs_fpgaboot/Kconfig index 232788def2c0..968a153c4ab6 100644 --- a/drivers/staging/gs_fpgaboot/Kconfig +++ b/drivers/staging/gs_fpgaboot/Kconfig @@ -4,6 +4,5 @@ # config GS_FPGABOOT tristate "Xilinx FPGA firmware download module" - default n help Xilinx FPGA firmware download module diff --git a/drivers/staging/media/rockchip/vpu/Kconfig b/drivers/staging/media/rockchip/vpu/Kconfig index 208f0379b31f..fc54bbf6753d 100644 --- a/drivers/staging/media/rockchip/vpu/Kconfig +++ b/drivers/staging/media/rockchip/vpu/Kconfig @@ -6,7 +6,6 @@ config VIDEO_ROCKCHIP_VPU select VIDEOBUF2_DMA_CONTIG select VIDEOBUF2_VMALLOC select V4L2_MEM2MEM_DEV - default n help Support for the Video Processing Unit present on Rockchip SoC, which accelerates video and image encoding and decoding. diff --git a/drivers/staging/rtl8192e/Kconfig b/drivers/staging/rtl8192e/Kconfig index 8b3da2b00cb3..11528d17bb3c 100644 --- a/drivers/staging/rtl8192e/Kconfig +++ b/drivers/staging/rtl8192e/Kconfig @@ -2,7 +2,6 @@ config RTLLIB tristate "Support for rtllib wireless devices" depends on WLAN && m - default n select LIB80211 help If you have a wireless card that uses rtllib, say diff --git a/drivers/staging/wilc1000/Kconfig b/drivers/staging/wilc1000/Kconfig index 81d052a46e57..59e58550d139 100644 --- a/drivers/staging/wilc1000/Kconfig +++ b/drivers/staging/wilc1000/Kconfig @@ -34,7 +34,6 @@ config WILC1000_SPI config WILC1000_HW_OOB_INTR bool "WILC1000 out of band interrupt" depends on WILC1000_SDIO - default n help This option enables out-of-band interrupt support for the WILC1000 chipset. This OOB interrupt is intended to provide a faster interrupt diff --git a/drivers/staging/wlan-ng/Kconfig b/drivers/staging/wlan-ng/Kconfig index b796bfd429c4..ac136663fa8e 100644 --- a/drivers/staging/wlan-ng/Kconfig +++ b/drivers/staging/wlan-ng/Kconfig @@ -4,7 +4,6 @@ config PRISM2_USB depends on WLAN && USB && CFG80211 select WIRELESS_EXT select WEXT_PRIV - default n help This is the wlan-ng prism 2.5/3 USB driver for a wide range of old USB wireless devices. -- 2.45.2