Skip to contentSkip to conversation

block: remove cmdline-parser.c

PATCH Applied Christoph Hellwig 2 participants 2 messages Jul 28, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 block: remove cmdline-parser.c

cmdline-parser.c is only used by the cmdline faux partition format, so merge the code into that and avoid an indirect call.

---
 arch/m68k/configs/stmark2_defconfig |   1 -
 block/Kconfig                       |  10 --
 block/Makefile                      |   1 -
 block/cmdline-parser.c              | 255 --------------------------
 block/partitions/Kconfig            |   1 -
 block/partitions/cmdline.c          | 267 +++++++++++++++++++++++++++-
 include/linux/cmdline-parser.h      |  46 -----
 7 files changed, 262 insertions(+), 319 deletions(-)
 delete mode 100644 block/cmdline-parser.c
 delete mode 100644 include/linux/cmdline-parser.h
arch/m68k/configs/stmark2_defconfig +0 -1
index d92306472fce..8898ae321779 100644
@@ -22,7 +22,6 @@ CONFIG_RAMSIZE=0x8000000
 CONFIG_VECTORBASE=0x40000000
 CONFIG_KERNELBASE=0x40001000
 # CONFIG_BLK_DEV_BSG is not set
-CONFIG_BLK_CMDLINE_PARSER=y
 CONFIG_BINFMT_FLAT=y
 CONFIG_BINFMT_ZFLAT=y
 CONFIG_BINFMT_MISC=y
block/Kconfig +0 -10
index fd732aede922..15dfb7660645 100644
@@ -114,16 +114,6 @@ config BLK_DEV_THROTTLING_LOW
 
 	Note, this is an experimental interface and could be changed someday.
 
-config BLK_CMDLINE_PARSER
-	bool "Block device command line partition parser"
-	help
-	Enabling this option allows you to specify the partition layout from
-	the kernel boot args.  This is typically of use for embedded devices
-	which don't otherwise have any standardized method for listing the
-	partitions on a block device.
-
-	See Documentation/block/cmdline-partition.rst for more information.
-
 config BLK_WBT
 	bool "Enable support for block device writeback throttling"
 	help
block/Makefile +0 -1
index bfbe4e13ca1e..c72592b4cf31 100644
@@ -28,7 +28,6 @@ obj-$(CONFIG_MQ_IOSCHED_KYBER)	+= kyber-iosched.o
 bfq-y				:= bfq-iosched.o bfq-wf2q.o bfq-cgroup.o
 obj-$(CONFIG_IOSCHED_BFQ)	+= bfq.o
 
-obj-$(CONFIG_BLK_CMDLINE_PARSER)	+= cmdline-parser.o
 obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o blk-integrity.o
 obj-$(CONFIG_BLK_DEV_INTEGRITY_T10)	+= t10-pi.o
 obj-$(CONFIG_BLK_MQ_PCI)	+= blk-mq-pci.o
block/cmdline-parser.c deleted +0 -255

255 lines not on this page · raw message

block/partitions/Kconfig +0 -1
index 6e2a649669e5..278593b8e4e9 100644
@@ -264,7 +264,6 @@ config SYSV68_PARTITION
 
 config CMDLINE_PARTITION
 	bool "Command line partition support" if PARTITION_ADVANCED
-	select BLK_CMDLINE_PARSER
 	help
 	  Say Y here if you want to read the partition table from bootargs.
 	  The format for the command line is just like mtdparts.
block/partitions/cmdline.c +262 -5

295 lines not on this page · raw message

include/linux/cmdline-parser.h deleted +0 -46

46 lines not on this page · raw message

Signature · 1 line
2.30.2
maintainer Applied
#1 lore raw
Quoted 2 lines · Christoph Hellwig

cmdline-parser.c is only used by the cmdline faux partition format, so merge the code into that and avoid an indirect call.

Applied, thanks.

Signature · 1 line
Jens Axboe