Skip to content

Commit

Permalink
block: remove cmdline-parser.c
Browse files Browse the repository at this point in the history
cmdline-parser.c is only used by the cmdline faux partition format,
so merge the code into that and avoid an indirect call.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20210728053756.409654-1-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Christoph Hellwig authored and Jens Axboe committed Aug 2, 2021
1 parent abd2864 commit 2164877
Show file tree
Hide file tree
Showing 7 changed files with 262 additions and 319 deletions.
1 change: 0 additions & 1 deletion arch/m68k/configs/stmark2_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions block/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion block/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
255 changes: 0 additions & 255 deletions block/cmdline-parser.c

This file was deleted.

1 change: 0 additions & 1 deletion block/partitions/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Loading

0 comments on commit 2164877

Please sign in to comment.