[2/2] ARM: configs: Cleanup old Kconfig options
diff mbox series

Message ID 20200130195525.4525-2-krzk@kernel.org
State New
Headers show
Series
  • Untitled series #156080
Related show

Commit Message

Krzysztof Kozlowski Jan. 30, 2020, 7:55 p.m. UTC
CONFIG_MMC_BLOCK_BOUNCE is gone since commit c3dccb74be28 ("mmc: core:
Delete bounce buffer Kconfig option").

CONFIG_LBDAF is gone since commit 72deb455b5ec ("block: remove
CONFIG_LBDAF").

CONFIG_IOSCHED_DEADLINE and CONFIG_IOSCHED_CFQ are gone since
commit f382fb0bcef4 ("block: remove legacy IO schedulers").

The IOSCHED_DEADLINE was replaced by MQ_IOSCHED_DEADLINE and it will be
now enabled by default (along with MQ_IOSCHED_KYBER).

The IOSCHED_BFQ seems to replace IOSCHED_CFQ so select it in configs
previously choosing the latter.

CONFIG_CROSS_COMPILE is gone since commit f1089c92da79 ("kbuild: remove
CONFIG_CROSS_COMPILE support").

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
---
 arch/arm/configs/am200epdkit_defconfig    | 2 --
 arch/arm/configs/axm55xx_defconfig        | 1 -
 arch/arm/configs/clps711x_defconfig       | 1 -
 arch/arm/configs/cns3420vb_defconfig      | 2 +-
 arch/arm/configs/colibri_pxa300_defconfig | 1 -
 arch/arm/configs/collie_defconfig         | 2 --
 arch/arm/configs/davinci_all_defconfig    | 2 --
 arch/arm/configs/efm32_defconfig          | 2 --
 arch/arm/configs/ep93xx_defconfig         | 1 -
 arch/arm/configs/eseries_pxa_defconfig    | 2 --
 arch/arm/configs/ezx_defconfig            | 1 -
 arch/arm/configs/h3600_defconfig          | 2 --
 arch/arm/configs/h5000_defconfig          | 1 -
 arch/arm/configs/imote2_defconfig         | 1 -
 arch/arm/configs/imx_v4_v5_defconfig      | 2 --
 arch/arm/configs/lpc18xx_defconfig        | 4 ----
 arch/arm/configs/magician_defconfig       | 2 --
 arch/arm/configs/moxart_defconfig         | 1 -
 arch/arm/configs/mxs_defconfig            | 2 --
 arch/arm/configs/omap1_defconfig          | 2 --
 arch/arm/configs/palmz72_defconfig        | 2 --
 arch/arm/configs/pcm027_defconfig         | 2 --
 arch/arm/configs/pleb_defconfig           | 2 --
 arch/arm/configs/realview_defconfig       | 1 -
 arch/arm/configs/sama5_defconfig          | 3 ---
 arch/arm/configs/stm32_defconfig          | 2 --
 arch/arm/configs/u300_defconfig           | 2 --
 arch/arm/configs/vexpress_defconfig       | 2 --
 arch/arm/configs/viper_defconfig          | 1 -
 arch/arm/configs/zeus_defconfig           | 2 --
 arch/arm/configs/zx_defconfig             | 1 -
 31 files changed, 1 insertion(+), 53 deletions(-)

Comments

Joe Perches Jan. 30, 2020, 10:04 p.m. UTC | #1
On Thu, 2020-01-30 at 20:55 +0100, Krzysztof Kozlowski wrote:
> CONFIG_MMC_BLOCK_BOUNCE is gone since commit c3dccb74be28 ("mmc: core:
> Delete bounce buffer Kconfig option").
> 
> CONFIG_LBDAF is gone since commit 72deb455b5ec ("block: remove
> CONFIG_LBDAF").
> 
> CONFIG_IOSCHED_DEADLINE and CONFIG_IOSCHED_CFQ are gone since
> commit f382fb0bcef4 ("block: remove legacy IO schedulers").
> 
> The IOSCHED_DEADLINE was replaced by MQ_IOSCHED_DEADLINE and it will be
> now enabled by default (along with MQ_IOSCHED_KYBER).
> 
> The IOSCHED_BFQ seems to replace IOSCHED_CFQ so select it in configs
> previously choosing the latter.
> 
> CONFIG_CROSS_COMPILE is gone since commit f1089c92da79 ("kbuild: remove
> CONFIG_CROSS_COMPILE support").

Hi Krzysztof.

There seems there are a lot more of these unused CONFIG_<foo>
symbols in various defconfigs. (just for arm and treewide below)

ARM defconfigs:

--------------------------------------------------------------------

# find all defined config symbols in Kconfig files

$ git grep -P -oh '^\s*(?:menu)?config\s+\w+' -- '*/Kconfig*' | \
  sed -r -e 's/\s*config\s+//' -e 's/\s*menuconfig\s+//' | \
  sort | uniq > config_symbols

# find CONFIG_ symbols in arm defconfigs

$ git grep -w -oh -P 'CONFIG_\w+' 'arch/arm*/*defconfig*' | \
  sort | uniq > used_in_arm_defconfigs

# find all the unused symbols

$ cat used_in_arm_defconfigs | \
  while read line ; do \
    echo -n "$line " ; grep -w -c ${line/CONFIG_/} config_symbols ; \
  done | \
  grep " 0" | \
  sed 's/ 0//'
CONFIG_ARCH_AUTCPU12
CONFIG_ARCH_CDB89712
CONFIG_ARCH_CLEP7312
CONFIG_ARCH_EDB7211
CONFIG_ARCH_P720T
CONFIG_ARCH_R8A7796
CONFIG_BT_HCIBTUART
CONFIG_CC_STACKPROTECTOR_REGULAR
CONFIG_CHR_DEV_OSST
CONFIG_CIFS_STATS
CONFIG_CROSS_COMPILE
CONFIG_DEBUG_SPINLOCK_SLEEP
CONFIG_DETECT_SOFTLOCKUP
CONFIG_DM9000_DEBUGLEVEL
CONFIG_DRM_TINYDRM
CONFIG_EXT3_DEFAULTS_TO_ORDERED
CONFIG_EXT3_FS_XATTR
CONFIG_FB_XGI
CONFIG_GPIO_MOXART
CONFIG_HOTPLUG
CONFIG_INET6_XFRM_MODE_BEET
CONFIG_INET6_XFRM_MODE_TRANSPORT
CONFIG_INET6_XFRM_MODE_TUNNEL
CONFIG_INET_XFRM_MODE_BEET
CONFIG_INET_XFRM_MODE_TRANSPORT
CONFIG_INET_XFRM_MODE_TUNNEL
CONFIG_IOSCHED_CFQ
CONFIG_IOSCHED_DEADLINE
CONFIG_IP_NF_MATCH_ADDRTYPE
CONFIG_IP_NF_TARGET_LOG
CONFIG_IPX
CONFIG_IRCOMM
CONFIG_IRDA
CONFIG_IRDA_CACHE_LAST_LSAP
CONFIG_IRDA_DEBUG
CONFIG_IRDA_FAST_RR
CONFIG_IRDA_ULTRA
CONFIG_IRLAN
CONFIG_IRNET
CONFIG_IRTTY_SIR
CONFIG_KALLSYMS_EXTRA_PASS
CONFIG_LBDAF
CONFIG_LEDS_CPU
CONFIG_LEDS_TIMER
CONFIG_MAC80211_RC_PID
CONFIG_MACH_BIGDISK
CONFIG_MACH_D2NET
CONFIG_MACH_DOVE_DT
CONFIG_MACH_EDMINI_V2_DT
CONFIG_MACH_LINKSTATION_LSCHL
CONFIG_MACH_MSS2
CONFIG_MACH_U300_SPIDUMMY
CONFIG_MACH_VOICEBLUE
CONFIG_MEDIA_TUNER_CUSTOMISE
CONFIG_MMC_BLOCK_BOUNCE
CONFIG_MMP_SPI
CONFIG_MTD_DEBUG
CONFIG_MTD_DEBUG_VERBOSE
CONFIG_MTD_DOC2000
CONFIG_MTD_DOC2001
CONFIG_MTD_DOC2001PLUS
CONFIG_MTD_DOCPROBE_ADDRESS
CONFIG_MTD_DOCPROBE_ADVANCED
CONFIG_MTD_DOCPROBE_HIGH
CONFIG_MTD_M25P80
CONFIG_NET_CADENCE
CONFIG_NET_DMA
CONFIG_NET_ETHERNET
CONFIG_NET_PCI
CONFIG_NET_PCMCIA
CONFIG_NET_VENDOR_SMC
CONFIG_NF_CONNTRACK_IPV4
CONFIG_NF_CONNTRACK_IPV6
CONFIG_PCIE_AXXIA
CONFIG_PM_RUNTIME
CONFIG_PROC_DEVICETREE
CONFIG_PXA_FICP
CONFIG_QCOM_ADSP_PIL
CONFIG_QCOM_Q6V5_PIL
CONFIG_SA1100_FIR
CONFIG_SCSI_MULTI_LUN
CONFIG_SMB_FS
CONFIG_SMB_NLS_DEFAULT
CONFIG_SOC_CAMERA_OV2640
CONFIG_SOC_CAMERA_PLATFORM
CONFIG_SOUND_DMAP
CONFIG_SOUND_OSS
CONFIG_SOUND_PRIME
CONFIG_SOUND_TRACEINIT
CONFIG_SOUND_VIDC
CONFIG_SOUND_WAVEARTIST
CONFIG_SOUND_YM3812
CONFIG_SUSPEND_TIME
CONFIG_SYSCTL_SYSCALL
CONFIG_TIMER_STATS
CONFIG_UID_STAT
CONFIG_USB_CHIPIDEA_ULPI
CONFIG_USB_EHCI_HCD_AXXIA
CONFIG_USB_EHCI_MSM
CONFIG_USB_GADGET_DUMMY_HCD
CONFIG_USB_MSM_OTG
CONFIG_V4L_USB_DRIVERS
CONFIG_VIDEO_HELPER_CHIPS_AUTO
CONFIG_WAN_ROUTER
CONFIG_WAN_ROUTER_DRIVERS
CONFIG_WINBOND_FIR

--------------------------------------------------------------------

And treewide defconfigs:

$ git grep -P -oh '^\s*(?:menu)?config\s+\w+' -- '*/Kconfig*' | \
  sed -r -e 's/\s*config\s+//' -e 's/\s*menuconfig\s+//' | \
  sort | uniq > config_symbols

$ git grep -w -oh -P 'CONFIG_\w+' '*defconfig*' | \
  sort | uniq >  used_in_defconfigs

$ cat used_in_defconfigs | \
  while read line ; do \
    echo -n "$line " ; grep -w -c ${line/CONFIG_/} config_symbols ;  \
  done | \
  grep " 0" | \
  sed 's/ 0//'
CONFIG_ALI_FIR
CONFIG_ARCH_AUTCPU12
CONFIG_ARCH_CDB89712
CONFIG_ARCH_CLEP7312
CONFIG_ARCH_EDB7211
CONFIG_ARCH_P720T
CONFIG_ARCH_R8A7796
CONFIG_ARCPGU_DISPTYPE
CONFIG_ARCPGU_RGB888
CONFIG_ARPD
CONFIG_ATH79_MACH_AP121
CONFIG_ATH79_MACH_AP136
CONFIG_ATH79_MACH_AP81
CONFIG_ATH79_MACH_DB120
CONFIG_ATH79_MACH_PB44
CONFIG_ATH79_MACH_UBNT_XM
CONFIG_BLK_DEV_RAM_DAX
CONFIG_BOARD_EVM6457
CONFIG_BOARD_EVM6472
CONFIG_BOARD_EVM6474
CONFIG_BOARD_EVM6678
CONFIG_BT_HCIBTUART
CONFIG_CC_STACKPROTECTOR_REGULAR
CONFIG_CFQ_GROUP_IOSCHED
CONFIG_CGROUP_MEMCG
CONFIG_CGROUP_MEMCG_SWAP
CONFIG_CHR_DEV_OSST
CONFIG_CIFS_STATS
CONFIG_CROSS_COMPILE
CONFIG_CRYPTO_AES_586
CONFIG_CSKY_MPTIMER
CONFIG_DEBUG_SPINLOCK_SLEEP
CONFIG_DEFAULT_DEADLINE
CONFIG_DEFAULT_NOOP
CONFIG_DETECT_SOFTLOCKUP
CONFIG_DEVPTS_MULTIPLE_INSTANCES
CONFIG_DM9000_DEBUGLEVEL
CONFIG_DRM_TINYDRM
CONFIG_DSCC4
CONFIG_DVB_FE_CUSTOMISE
CONFIG_ENABLE_WARN_DEPRECATED
CONFIG_EXOFS_FS
CONFIG_EXPERIMENTAL
CONFIG_EXT2_FS_XIP
CONFIG_EXT3_DEFAULTS_TO_ORDERED
CONFIG_EXT3_FS_XATTR
CONFIG_FB_SH7785FB
CONFIG_FB_XGI
CONFIG_GPIO_MOXART
CONFIG_HEADERS_CHECK
CONFIG_HID_SUPPORT
CONFIG_HOTPLUG
CONFIG_I2C_PARPORT_LIGHT
CONFIG_INET6_XFRM_MODE_BEET
CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION
CONFIG_INET6_XFRM_MODE_TRANSPORT
CONFIG_INET6_XFRM_MODE_TUNNEL
CONFIG_INET_LRO
CONFIG_INET_XFRM_MODE_BEET
CONFIG_INET_XFRM_MODE_TRANSPORT
CONFIG_INET_XFRM_MODE_TUNNEL
CONFIG_INFINIBAND_CXGB3
CONFIG_IOSCHED_CFQ
CONFIG_IOSCHED_DEADLINE
CONFIG_IP_NF_MATCH_ADDRTYPE
CONFIG_IP_NF_TARGET_LOG
CONFIG_IPV6_PRIVACY
CONFIG_IPX
CONFIG_IRCOMM
CONFIG_IRDA
CONFIG_IRDA_CACHE_LAST_LSAP
CONFIG_IRDA_DEBUG
CONFIG_IRDA_FAST_RR
CONFIG_IRDA_ULTRA
CONFIG_IRLAN
CONFIG_IRNET
CONFIG_IRTTY_SIR
CONFIG_KALLSYMS_EXTRA_PASS
CONFIG_KINGSUN_DONGLE
CONFIG_KS959_DONGLE
CONFIG_KSDAZZLE_DONGLE
CONFIG_LBDAF
CONFIG_LEDS_CPU
CONFIG_LEDS_TIMER
CONFIG_MAC80211_RC_PID
CONFIG_MACH_BIGDISK
CONFIG_MACH_D2NET
CONFIG_MACH_DOVE_DT
CONFIG_MACH_EDMINI_V2_DT
CONFIG_MACH_LINKSTATION_LSCHL
CONFIG_MACH_MSS2
CONFIG_MACH_U300_SPIDUMMY
CONFIG_MACH_VOICEBLUE
CONFIG_MCS_FIR
CONFIG_MEDIA_TUNER_CUSTOMISE
CONFIG_MFD_SH_MOBILE_SDHI
CONFIG_MMC_BLOCK_BOUNCE
CONFIG_MMP_SPI
CONFIG_MTD_CHAR
CONFIG_MTD_DEBUG
CONFIG_MTD_DEBUG_VERBOSE
CONFIG_MTD_DOC2000
CONFIG_MTD_DOC2001
CONFIG_MTD_DOC2001PLUS
CONFIG_MTD_DOCPROBE_ADDRESS
CONFIG_MTD_DOCPROBE_ADVANCED
CONFIG_MTD_DOCPROBE_HIGH
CONFIG_MTD_M25P80
CONFIG_MTD_PARTITIONS
CONFIG_NCP_FS
CONFIG_NCPFS_EXTRAS
CONFIG_NCPFS_IOCTL_LOCKING
CONFIG_NCPFS_NFS_NS
CONFIG_NCPFS_NLS
CONFIG_NCPFS_OS2_NS
CONFIG_NCPFS_PACKET_SIGNING
CONFIG_NCPFS_SMALLDOS
CONFIG_NCPFS_STRONG
CONFIG_NET_CADENCE
CONFIG_NET_DCCPPROBE
CONFIG_NETDEV_1000
CONFIG_NETDEV_10000
CONFIG_NET_DMA
CONFIG_NET_ETHERNET
CONFIG_NET_PACKET_ENGINE
CONFIG_NET_PCI
CONFIG_NET_PCMCIA
CONFIG_NET_TCPPROBE
CONFIG_NET_VENDOR_EXAR
CONFIG_NET_VENDOR_SMC
CONFIG_NF_CONNTRACK_IPV4
CONFIG_NF_CONNTRACK_IPV6
CONFIG_NF_NAT_IPV4
CONFIG_NF_NAT_IPV6
CONFIG_NR_DMA_CHANNELS
CONFIG_NR_DMA_CHANNELS_BOOL
CONFIG_NSC_FIR
CONFIG_OCTEON_ETHERNET
CONFIG_OCTEON_USB
CONFIG_PCIEASPM_DEBUG
CONFIG_PCIE_AXXIA
CONFIG_PCI_LEGACY
CONFIG_PERF_COUNTERS
CONFIG_PHONE
CONFIG_PM_RUNTIME
CONFIG_PROC_DEVICETREE
CONFIG_PUV3_AC97
CONFIG_PUV3_MMC
CONFIG_PUV3_MUSB
CONFIG_PUV3_NAND
CONFIG_PUV3_UART
CONFIG_PUV3_UMAL
CONFIG_PXA_FICP
CONFIG_QCOM_ADSP_PIL
CONFIG_QCOM_Q6V5_PIL
CONFIG_RCU_CPU_STALL_INFO
CONFIG_SA1100_FIR
CONFIG_SBC834x
CONFIG_SCSI_MULTI_LUN
CONFIG_SCSI_OSD_INITIATOR
CONFIG_SCSI_OSD_ULD
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE
CONFIG_SH_SIR
CONFIG_SIGMATEL_FIR
CONFIG_SMB_FS
CONFIG_SMB_NLS_DEFAULT
CONFIG_SMC_IRCC_FIR
CONFIG_SND_FSI_AK4642
CONFIG_SND_FSI_DA7210
CONFIG_SOC_CAMERA_MT9T112
CONFIG_SOC_CAMERA_OV2640
CONFIG_SOC_CAMERA_OV772X
CONFIG_SOC_CAMERA_PLATFORM
CONFIG_SOC_CAMERA_TW9910
CONFIG_SOUND_DMAP
CONFIG_SOUND_OSS
CONFIG_SOUND_PRIME
CONFIG_SOUND_TRACEINIT
CONFIG_SOUND_VIDC
CONFIG_SOUND_WAVEARTIST
CONFIG_SOUND_YM3812
CONFIG_SPI_XILINX_PLTFM
CONFIG_STAGING_EXCLUDE_BUILD
CONFIG_SUSPEND_TIME
CONFIG_SYSCTL_SYSCALL
CONFIG_TIMER_STATS
CONFIG_TOSHIBA_FIR
CONFIG_TREE_PREEMPT_RCU
CONFIG_UID_STAT
CONFIG_UIO_PDRV
CONFIG_USB_CHIPIDEA_ULPI
CONFIG_USB_CMMB_INNOFIDEI
CONFIG_USB_EHCI_HCD_AXXIA
CONFIG_USB_EHCI_MSM
CONFIG_USB_GADGET_DUMMY_HCD
CONFIG_USB_GADGET_M66592
CONFIG_USB_IRDA
CONFIG_USB_MSM_OTG
CONFIG_USB_WLAN_HED_AQ3
CONFIG_V4L_USB_DRIVERS
CONFIG_VIA_FIR
CONFIG_VIDEO_ALLOW_V4L1
CONFIG_VIDEO_HELPER_CHIPS_AUTO
CONFIG_VIDEO_SH_MOBILE_CEU
CONFIG_VLSI_FIR
CONFIG_W1_SLAVE_DS2760
CONFIG_WAN_ROUTER
CONFIG_WAN_ROUTER_DRIVERS
CONFIG_WINBOND_FIR
CONFIG_WLAN_80211
Krzysztof Kozlowski Feb. 3, 2020, 11:52 a.m. UTC | #2
On Thu, 30 Jan 2020 at 23:06, Joe Perches <joe@perches.com> wrote:
>
> On Thu, 2020-01-30 at 20:55 +0100, Krzysztof Kozlowski wrote:
> > CONFIG_MMC_BLOCK_BOUNCE is gone since commit c3dccb74be28 ("mmc: core:
> > Delete bounce buffer Kconfig option").
> >
> > CONFIG_LBDAF is gone since commit 72deb455b5ec ("block: remove
> > CONFIG_LBDAF").
> >
> > CONFIG_IOSCHED_DEADLINE and CONFIG_IOSCHED_CFQ are gone since
> > commit f382fb0bcef4 ("block: remove legacy IO schedulers").
> >
> > The IOSCHED_DEADLINE was replaced by MQ_IOSCHED_DEADLINE and it will be
> > now enabled by default (along with MQ_IOSCHED_KYBER).
> >
> > The IOSCHED_BFQ seems to replace IOSCHED_CFQ so select it in configs
> > previously choosing the latter.
> >
> > CONFIG_CROSS_COMPILE is gone since commit f1089c92da79 ("kbuild: remove
> > CONFIG_CROSS_COMPILE support").
>
> Hi Krzysztof.
>
> There seems there are a lot more of these unused CONFIG_<foo>
> symbols in various defconfigs. (just for arm and treewide below)
>
> ARM defconfigs:

Hi Joe,

Nice finding! The trickier point is to nicely remove them because:
1. The easiest is 'savedefconfig' but then some valuable options might
disappear (like recently happened with DEBUG_FS),
2. They could be removed in automated way with a script. However in
such case what about replacements? If some symbol was replaced with
other (or just renamed), maybe we should enable the other one to
restore the desired functionality?
3. Or maybe let's don't care about keeping defconfigs stable and just
clean them up automatically.

Best regards,
Krzysztof

> --------------------------------------------------------------------
>
> # find all defined config symbols in Kconfig files
>
> $ git grep -P -oh '^\s*(?:menu)?config\s+\w+' -- '*/Kconfig*' | \
>   sed -r -e 's/\s*config\s+//' -e 's/\s*menuconfig\s+//' | \
>   sort | uniq > config_symbols
>
> # find CONFIG_ symbols in arm defconfigs
>
> $ git grep -w -oh -P 'CONFIG_\w+' 'arch/arm*/*defconfig*' | \
>   sort | uniq > used_in_arm_defconfigs
>
> # find all the unused symbols
>
> $ cat used_in_arm_defconfigs | \
>   while read line ; do \
>     echo -n "$line " ; grep -w -c ${line/CONFIG_/} config_symbols ; \
>   done | \
>   grep " 0" | \
>   sed 's/ 0//'

(...)
Arnd Bergmann Feb. 3, 2020, 12:25 p.m. UTC | #3
On Mon, Feb 3, 2020 at 12:53 PM Krzysztof Kozlowski <krzk@kernel.org> wrote:
>
> On Thu, 30 Jan 2020 at 23:06, Joe Perches <joe@perches.com> wrote:
> >
> > On Thu, 2020-01-30 at 20:55 +0100, Krzysztof Kozlowski wrote:
> > > CONFIG_MMC_BLOCK_BOUNCE is gone since commit c3dccb74be28 ("mmc: core:
> > > Delete bounce buffer Kconfig option").
> > >
> > > CONFIG_LBDAF is gone since commit 72deb455b5ec ("block: remove
> > > CONFIG_LBDAF").
> > >
> > > CONFIG_IOSCHED_DEADLINE and CONFIG_IOSCHED_CFQ are gone since
> > > commit f382fb0bcef4 ("block: remove legacy IO schedulers").
> > >
> > > The IOSCHED_DEADLINE was replaced by MQ_IOSCHED_DEADLINE and it will be
> > > now enabled by default (along with MQ_IOSCHED_KYBER).
> > >
> > > The IOSCHED_BFQ seems to replace IOSCHED_CFQ so select it in configs
> > > previously choosing the latter.
> > >
> > > CONFIG_CROSS_COMPILE is gone since commit f1089c92da79 ("kbuild: remove
> > > CONFIG_CROSS_COMPILE support").

Acked-by: Arnd Bergmann <arnd@arndb.de>

> > Hi Krzysztof.
> >
> > There seems there are a lot more of these unused CONFIG_<foo>
> > symbols in various defconfigs. (just for arm and treewide below)

Feel free to pick any of these symbols and send patches for those.
No need to do it one symbol at a time, but please group them like
Krzysztof has done.

> Nice finding! The trickier point is to nicely remove them because:
> 1. The easiest is 'savedefconfig' but then some valuable options might
> disappear (like recently happened with DEBUG_FS),
> 2. They could be removed in automated way with a script. However in
> such case what about replacements? If some symbol was replaced with
> other (or just renamed), maybe we should enable the other one to
> restore the desired functionality?
> 3. Or maybe let's don't care about keeping defconfigs stable and just
> clean them up automatically.

I don't see a good way to do it automatically. It would be good to check
that we don't remove Kconfig symbols that are still used in defconfig
files without changing those files as well. Cleaning up afterwards also
works, but this always requires manual inspection for each symbol.

     Arnd
Olof Johansson Feb. 9, 2020, 11:44 a.m. UTC | #4
On Mon, Feb 03, 2020 at 12:52:45PM +0100, Krzysztof Kozlowski wrote:
> On Thu, 30 Jan 2020 at 23:06, Joe Perches <joe@perches.com> wrote:
> >
> > On Thu, 2020-01-30 at 20:55 +0100, Krzysztof Kozlowski wrote:
> > > CONFIG_MMC_BLOCK_BOUNCE is gone since commit c3dccb74be28 ("mmc: core:
> > > Delete bounce buffer Kconfig option").
> > >
> > > CONFIG_LBDAF is gone since commit 72deb455b5ec ("block: remove
> > > CONFIG_LBDAF").
> > >
> > > CONFIG_IOSCHED_DEADLINE and CONFIG_IOSCHED_CFQ are gone since
> > > commit f382fb0bcef4 ("block: remove legacy IO schedulers").
> > >
> > > The IOSCHED_DEADLINE was replaced by MQ_IOSCHED_DEADLINE and it will be
> > > now enabled by default (along with MQ_IOSCHED_KYBER).
> > >
> > > The IOSCHED_BFQ seems to replace IOSCHED_CFQ so select it in configs
> > > previously choosing the latter.
> > >
> > > CONFIG_CROSS_COMPILE is gone since commit f1089c92da79 ("kbuild: remove
> > > CONFIG_CROSS_COMPILE support").
> >
> > Hi Krzysztof.
> >
> > There seems there are a lot more of these unused CONFIG_<foo>
> > symbols in various defconfigs. (just for arm and treewide below)
> >
> > ARM defconfigs:
> 
> Hi Joe,
> 
> Nice finding! The trickier point is to nicely remove them because:
> 1. The easiest is 'savedefconfig' but then some valuable options might
> disappear (like recently happened with DEBUG_FS),

Note that while they disappear from the defconfig, they were already not part
of the build. So kernels have been built without them for a while. It's a good
way to surface the problem, but it's pretty clear that trees fall in the forest
here all the time and nobody is noticing.

> 2. They could be removed in automated way with a script. However in
> such case what about replacements? If some symbol was replaced with
> other (or just renamed), maybe we should enable the other one to
> restore the desired functionality?
> 3. Or maybe let's don't care about keeping defconfigs stable and just
> clean them up automatically.

Churning defconfigs is just noise, and a source of annoying needless
conflicts when people do it at the same time. If an option is no longer
in-tree, it doesn't do any harm. But it makes sense to clean up every
now and then like the original patch here.


-Olof

Patch
diff mbox series

diff --git a/arch/arm/configs/am200epdkit_defconfig b/arch/arm/configs/am200epdkit_defconfig
index 622436f44783..f56ac394caf1 100644
--- a/arch/arm/configs/am200epdkit_defconfig
+++ b/arch/arm/configs/am200epdkit_defconfig
@@ -11,8 +11,6 @@  CONFIG_SLAB=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_PXA=y
 CONFIG_ARCH_GUMSTIX=y
 CONFIG_PCCARD=y
diff --git a/arch/arm/configs/axm55xx_defconfig b/arch/arm/configs/axm55xx_defconfig
index f53634af014b..6ea7dafa4c9e 100644
--- a/arch/arm/configs/axm55xx_defconfig
+++ b/arch/arm/configs/axm55xx_defconfig
@@ -25,7 +25,6 @@  CONFIG_EMBEDDED=y
 CONFIG_PROFILING=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
-# CONFIG_IOSCHED_DEADLINE is not set
 CONFIG_ARCH_AXXIA=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_ARM_LPAE=y
diff --git a/arch/arm/configs/clps711x_defconfig b/arch/arm/configs/clps711x_defconfig
index c255dab36bde..63a153f5cf68 100644
--- a/arch/arm/configs/clps711x_defconfig
+++ b/arch/arm/configs/clps711x_defconfig
@@ -7,7 +7,6 @@  CONFIG_EMBEDDED=y
 CONFIG_SLOB=y
 CONFIG_JUMP_LABEL=y
 CONFIG_PARTITION_ADVANCED=y
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_CLPS711X=y
 CONFIG_ARCH_AUTCPU12=y
 CONFIG_ARCH_CDB89712=y
diff --git a/arch/arm/configs/cns3420vb_defconfig b/arch/arm/configs/cns3420vb_defconfig
index 89df0a55a065..66a80b46038d 100644
--- a/arch/arm/configs/cns3420vb_defconfig
+++ b/arch/arm/configs/cns3420vb_defconfig
@@ -17,7 +17,7 @@  CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 # CONFIG_BLK_DEV_BSG is not set
-CONFIG_IOSCHED_CFQ=m
+CONFIG_IOSCHED_BFQ=m
 CONFIG_ARCH_MULTI_V6=y
 #CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_CNS3XXX=y
diff --git a/arch/arm/configs/colibri_pxa300_defconfig b/arch/arm/configs/colibri_pxa300_defconfig
index 446134c70a33..0dae3b185284 100644
--- a/arch/arm/configs/colibri_pxa300_defconfig
+++ b/arch/arm/configs/colibri_pxa300_defconfig
@@ -43,7 +43,6 @@  CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_MON=y
 CONFIG_USB_STORAGE=y
 CONFIG_MMC=y
-# CONFIG_MMC_BLOCK_BOUNCE is not set
 CONFIG_MMC_PXA=y
 CONFIG_EXT3_FS=y
 CONFIG_NFS_FS=y
diff --git a/arch/arm/configs/collie_defconfig b/arch/arm/configs/collie_defconfig
index e6df11e906ba..36384fd575f8 100644
--- a/arch/arm/configs/collie_defconfig
+++ b/arch/arm/configs/collie_defconfig
@@ -7,8 +7,6 @@  CONFIG_EXPERT=y
 # CONFIG_BASE_FULL is not set
 # CONFIG_EPOLL is not set
 CONFIG_SLOB=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_SA1100=y
 CONFIG_SA1100_COLLIE=y
 CONFIG_PCCARD=y
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig
index 231f8973bbb2..b5ba8d731a25 100644
--- a/arch/arm/configs/davinci_all_defconfig
+++ b/arch/arm/configs/davinci_all_defconfig
@@ -15,8 +15,6 @@  CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_PARTITION_ADVANCED=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_MULTIPLATFORM=y
 CONFIG_ARCH_MULTI_V7=n
 CONFIG_ARCH_MULTI_V5=y
diff --git a/arch/arm/configs/efm32_defconfig b/arch/arm/configs/efm32_defconfig
index 10ea92513a69..46213f0530c4 100644
--- a/arch/arm/configs/efm32_defconfig
+++ b/arch/arm/configs/efm32_defconfig
@@ -12,8 +12,6 @@  CONFIG_EMBEDDED=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 # CONFIG_MMU is not set
 CONFIG_ARM_SINGLE_ARMV7M=y
 CONFIG_ARCH_EFM32=y
diff --git a/arch/arm/configs/ep93xx_defconfig b/arch/arm/configs/ep93xx_defconfig
index ef2d2a820c30..cd16fb6eb8e6 100644
--- a/arch/arm/configs/ep93xx_defconfig
+++ b/arch/arm/configs/ep93xx_defconfig
@@ -11,7 +11,6 @@  CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_PARTITION_ADVANCED=y
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_EP93XX=y
 CONFIG_CRUNCH=y
 CONFIG_MACH_ADSSPHERE=y
diff --git a/arch/arm/configs/eseries_pxa_defconfig b/arch/arm/configs/eseries_pxa_defconfig
index 56452fa03d56..046f4dc2e18e 100644
--- a/arch/arm/configs/eseries_pxa_defconfig
+++ b/arch/arm/configs/eseries_pxa_defconfig
@@ -9,8 +9,6 @@  CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_PXA=y
 CONFIG_ARCH_PXA_ESERIES=y
 # CONFIG_ARM_THUMB is not set
diff --git a/arch/arm/configs/ezx_defconfig b/arch/arm/configs/ezx_defconfig
index 4e28771beecd..bd7b7f945e01 100644
--- a/arch/arm/configs/ezx_defconfig
+++ b/arch/arm/configs/ezx_defconfig
@@ -14,7 +14,6 @@  CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_PXA=y
 CONFIG_PXA_EZX=y
 CONFIG_NO_HZ=y
diff --git a/arch/arm/configs/h3600_defconfig b/arch/arm/configs/h3600_defconfig
index 4d91e41cb628..c02b3e409610 100644
--- a/arch/arm/configs/h3600_defconfig
+++ b/arch/arm/configs/h3600_defconfig
@@ -5,8 +5,6 @@  CONFIG_LOG_BUF_SHIFT=14
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_MODULES=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_SA1100=y
 CONFIG_SA1100_H3600=y
 CONFIG_PCCARD=y
diff --git a/arch/arm/configs/h5000_defconfig b/arch/arm/configs/h5000_defconfig
index 3946c6087327..f5a338fefda8 100644
--- a/arch/arm/configs/h5000_defconfig
+++ b/arch/arm/configs/h5000_defconfig
@@ -10,7 +10,6 @@  CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_PXA=y
 CONFIG_MACH_H5000=y
 CONFIG_AEABI=y
diff --git a/arch/arm/configs/imote2_defconfig b/arch/arm/configs/imote2_defconfig
index 770469f61c3e..05c5515fa871 100644
--- a/arch/arm/configs/imote2_defconfig
+++ b/arch/arm/configs/imote2_defconfig
@@ -13,7 +13,6 @@  CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_PXA=y
 CONFIG_MACH_INTELMOTE2=y
 CONFIG_NO_HZ=y
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index 2b2d617e279d..3df90fc38398 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -32,8 +32,6 @@  CONFIG_KPROBES=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
diff --git a/arch/arm/configs/lpc18xx_defconfig b/arch/arm/configs/lpc18xx_defconfig
index e518168a0627..be882ea0eee4 100644
--- a/arch/arm/configs/lpc18xx_defconfig
+++ b/arch/arm/configs/lpc18xx_defconfig
@@ -1,4 +1,3 @@ 
-CONFIG_CROSS_COMPILE="arm-linux-gnueabihf-"
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_PREEMPT=y
 CONFIG_BLK_DEV_INITRD=y
@@ -28,10 +27,7 @@  CONFIG_FLASH_SIZE=0x00080000
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ARM_APPENDED_DTB=y
-# CONFIG_LBDAF is not set
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_BINFMT_FLAT=y
 CONFIG_BINFMT_ZFLAT=y
 CONFIG_BINFMT_SHARED_FLAT=y
diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig
index e6486c959220..d2e684f6565a 100644
--- a/arch/arm/configs/magician_defconfig
+++ b/arch/arm/configs/magician_defconfig
@@ -9,8 +9,6 @@  CONFIG_SLAB=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_PXA=y
 CONFIG_MACH_H4700=y
 CONFIG_MACH_MAGICIAN=y
diff --git a/arch/arm/configs/moxart_defconfig b/arch/arm/configs/moxart_defconfig
index 45d27190c9c9..6834e97af348 100644
--- a/arch/arm/configs/moxart_defconfig
+++ b/arch/arm/configs/moxart_defconfig
@@ -15,7 +15,6 @@  CONFIG_EMBEDDED=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
 CONFIG_ARCH_MULTI_V4=y
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_MOXART=y
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig
index 2773899c21b3..a9c6f32a9b1c 100644
--- a/arch/arm/configs/mxs_defconfig
+++ b/arch/arm/configs/mxs_defconfig
@@ -25,8 +25,6 @@  CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_BLK_DEV_INTEGRITY=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig
index 0c43c589f191..3b6e7452609b 100644
--- a/arch/arm/configs/omap1_defconfig
+++ b/arch/arm/configs/omap1_defconfig
@@ -18,8 +18,6 @@  CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_OMAP=y
 CONFIG_ARCH_OMAP1=y
 CONFIG_OMAP_RESET_CLOCKS=y
diff --git a/arch/arm/configs/palmz72_defconfig b/arch/arm/configs/palmz72_defconfig
index 4a3fd82c2a0c..b47c8abe85bc 100644
--- a/arch/arm/configs/palmz72_defconfig
+++ b/arch/arm/configs/palmz72_defconfig
@@ -7,8 +7,6 @@  CONFIG_SLAB=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_PXA=y
 CONFIG_ARCH_PXA_PALM=y
 # CONFIG_MACH_PALMTX is not set
diff --git a/arch/arm/configs/pcm027_defconfig b/arch/arm/configs/pcm027_defconfig
index a8c53228b0c1..e97a158081fc 100644
--- a/arch/arm/configs/pcm027_defconfig
+++ b/arch/arm/configs/pcm027_defconfig
@@ -13,8 +13,6 @@  CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_PXA=y
 CONFIG_MACH_PCM027=y
 CONFIG_MACH_PCM990_BASEBOARD=y
diff --git a/arch/arm/configs/pleb_defconfig b/arch/arm/configs/pleb_defconfig
index f0541b060cfa..2170148b975c 100644
--- a/arch/arm/configs/pleb_defconfig
+++ b/arch/arm/configs/pleb_defconfig
@@ -6,8 +6,6 @@  CONFIG_EXPERT=y
 # CONFIG_HOTPLUG is not set
 # CONFIG_SHMEM is not set
 CONFIG_MODULES=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_SA1100=y
 CONFIG_SA1100_PLEB=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
diff --git a/arch/arm/configs/realview_defconfig b/arch/arm/configs/realview_defconfig
index 8a056cc0c1ec..70e2c74a9f32 100644
--- a/arch/arm/configs/realview_defconfig
+++ b/arch/arm/configs/realview_defconfig
@@ -8,7 +8,6 @@  CONFIG_SLAB=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_MULTI_V6=y
 CONFIG_ARCH_REALVIEW=y
 CONFIG_MACH_REALVIEW_EB=y
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig
index 27f6135c4ee7..bab7861443dc 100644
--- a/arch/arm/configs/sama5_defconfig
+++ b/arch/arm/configs/sama5_defconfig
@@ -14,8 +14,6 @@  CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_AT91=y
 CONFIG_SOC_SAMA5D2=y
 CONFIG_SOC_SAMA5D3=y
@@ -182,7 +180,6 @@  CONFIG_USB_GADGET=y
 CONFIG_USB_ATMEL_USBA=y
 CONFIG_USB_G_SERIAL=y
 CONFIG_MMC=y
-# CONFIG_MMC_BLOCK_BOUNCE is not set
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_OF_AT91=y
diff --git a/arch/arm/configs/stm32_defconfig b/arch/arm/configs/stm32_defconfig
index 152321d2893e..551db328009d 100644
--- a/arch/arm/configs/stm32_defconfig
+++ b/arch/arm/configs/stm32_defconfig
@@ -14,8 +14,6 @@  CONFIG_EMBEDDED=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 # CONFIG_MMU is not set
 CONFIG_ARCH_STM32=y
 CONFIG_CPU_V7M_NUM_IRQ=240
diff --git a/arch/arm/configs/u300_defconfig b/arch/arm/configs/u300_defconfig
index 8223397db047..543f07338100 100644
--- a/arch/arm/configs/u300_defconfig
+++ b/arch/arm/configs/u300_defconfig
@@ -11,7 +11,6 @@  CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_PARTITION_ADVANCED=y
-# CONFIG_IOSCHED_CFQ is not set
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_U300=y
 CONFIG_MACH_U300_SPIDUMMY=y
@@ -46,7 +45,6 @@  CONFIG_FB=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_USB_SUPPORT is not set
 CONFIG_MMC=y
-# CONFIG_MMC_BLOCK_BOUNCE is not set
 CONFIG_MMC_ARMMMCI=y
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_HCTOSYS is not set
diff --git a/arch/arm/configs/vexpress_defconfig b/arch/arm/configs/vexpress_defconfig
index 25753552277a..c01baf7d6e37 100644
--- a/arch/arm/configs/vexpress_defconfig
+++ b/arch/arm/configs/vexpress_defconfig
@@ -15,8 +15,6 @@  CONFIG_OPROFILE=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_VEXPRESS_DCSCB=y
 CONFIG_ARCH_VEXPRESS_TC2_PM=y
diff --git a/arch/arm/configs/viper_defconfig b/arch/arm/configs/viper_defconfig
index 2ff16168d9c2..989599ce5300 100644
--- a/arch/arm/configs/viper_defconfig
+++ b/arch/arm/configs/viper_defconfig
@@ -9,7 +9,6 @@  CONFIG_SLAB=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_PXA=y
 CONFIG_ARCH_VIPER=y
 CONFIG_IWMMXT=y
diff --git a/arch/arm/configs/zeus_defconfig b/arch/arm/configs/zeus_defconfig
index aa3023c9a011..d3b98c4d225b 100644
--- a/arch/arm/configs/zeus_defconfig
+++ b/arch/arm/configs/zeus_defconfig
@@ -4,7 +4,6 @@  CONFIG_LOG_BUF_SHIFT=13
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_PXA=y
 CONFIG_MACH_ARCOM_ZEUS=y
 CONFIG_PCCARD=m
@@ -137,7 +136,6 @@  CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_G_SERIAL=m
 CONFIG_USB_G_PRINTER=m
 CONFIG_MMC=y
-# CONFIG_MMC_BLOCK_BOUNCE is not set
 CONFIG_MMC_PXA=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=m
diff --git a/arch/arm/configs/zx_defconfig b/arch/arm/configs/zx_defconfig
index 4d2ef785ed34..a046a492bfa7 100644
--- a/arch/arm/configs/zx_defconfig
+++ b/arch/arm/configs/zx_defconfig
@@ -16,7 +16,6 @@  CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
 CONFIG_SLAB=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_ZX=y
 CONFIG_SOC_ZX296702=y
 # CONFIG_SWP_EMULATE is not set