Every instance where we register a block device, it's followed by an attempt to parse the partition table, most often with a warning when it fails. Thus let's move partition table parsing into blockdevice_register.
Signed-off-by: Ahmad Fatoum <[email protected]> --- arch/sandbox/board/hostfile.c | 4 ---- common/block.c | 6 ++++++ drivers/ata/disk_ata_drive.c | 5 ----- drivers/block/efi-block-io.c | 9 +-------- drivers/block/virtio_blk.c | 8 +------- drivers/mci/mci-core.c | 6 ------ drivers/nvme/host/core.c | 5 ----- drivers/usb/storage/usb.c | 5 ----- 8 files changed, 8 insertions(+), 40 deletions(-) diff --git a/arch/sandbox/board/hostfile.c b/arch/sandbox/board/hostfile.c index d0f400787d7a..a1ab06b87770 100644 --- a/arch/sandbox/board/hostfile.c +++ b/arch/sandbox/board/hostfile.c @@ -166,10 +166,6 @@ static int hf_probe(struct device *dev) if (err) return err; - err = parse_partition_table(&priv->blk); - if (err) - dev_warn(dev, "No partition table found\n"); - dev_info(dev, "registered as block device\n"); } else { cdev->name = np->name; diff --git a/common/block.c b/common/block.c index c39269d3a692..98adcfdf3dab 100644 --- a/common/block.c +++ b/common/block.c @@ -6,6 +6,7 @@ */ #include <common.h> #include <block.h> +#include <disks.h> #include <malloc.h> #include <linux/err.h> #include <linux/list.h> @@ -408,6 +409,11 @@ int blockdevice_register(struct block_device *blk) cdev_create_default_automount(&blk->cdev); + /* Lack of partition table is unusual, but not a failure */ + ret = parse_partition_table(blk); + if (ret) + dev_warn(blk->dev, "No partition table found\n"); + return 0; } diff --git a/drivers/ata/disk_ata_drive.c b/drivers/ata/disk_ata_drive.c index c1c736a0a88a..2d97710b827a 100644 --- a/drivers/ata/disk_ata_drive.c +++ b/drivers/ata/disk_ata_drive.c @@ -254,11 +254,6 @@ static int ata_port_init(struct ata_port *port) dev_info(dev, "registered /dev/%s\n", port->blk.cdev.name); - /* create partitions on demand */ - rc = parse_partition_table(&port->blk); - if (rc != 0) - dev_warn(dev, "No partition table found\n"); - return 0; on_error: diff --git a/drivers/block/efi-block-io.c b/drivers/block/efi-block-io.c index eb4981e86298..7162106ab8ea 100644 --- a/drivers/block/efi-block-io.c +++ b/drivers/block/efi-block-io.c @@ -12,7 +12,6 @@ #include <fcntl.h> #include <efi.h> #include <block.h> -#include <disks.h> #include <efi/efi-payload.h> #include <efi/efi-device.h> #include <bootsource.h> @@ -184,16 +183,10 @@ static int efi_bio_probe(struct efi_device *efidev) priv->media_id = media->media_id; - ret = blockdevice_register(&priv->blk); - if (ret) - return ret; - if (efi_get_bootsource() == efidev) bootsource_set_raw_instance(instance); - parse_partition_table(&priv->blk); - - return 0; + return blockdevice_register(&priv->blk); } static struct efi_driver efi_bio_driver = { diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 660f3a7b6b9b..11e52d9e6457 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -105,13 +105,7 @@ static int virtio_blk_probe(struct virtio_device *vdev) priv->blk.num_blocks = cap; priv->blk.ops = &virtio_blk_ops; - ret = blockdevice_register(&priv->blk); - if (ret) - return ret; - - parse_partition_table(&priv->blk); - - return 0; + return blockdevice_register(&priv->blk); } static void virtio_blk_remove(struct virtio_device *vdev) diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c index 6d0d6473770c..32edd5382386 100644 --- a/drivers/mci/mci-core.c +++ b/drivers/mci/mci-core.c @@ -1900,12 +1900,6 @@ static int mci_register_partition(struct mci_part *part) return 0; } - rc = parse_partition_table(&part->blk); - if (rc != 0) { - /* Lack of partition table is unusual, but not a failure */ - dev_warn(&mci->dev, "No partition table found\n"); - } - if (np) { of_parse_partitions(&part->blk.cdev, np); diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index bf9176ce0922..79a5f9325ef8 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only #include <common.h> -#include <disks.h> #include "nvme.h" @@ -373,10 +372,6 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) goto out_free_id; } - ret = parse_partition_table(&ns->blk); - if (ret) - dev_warn(ctrl->dev, "No partition table found\n"); - return; out_free_id: kfree(id); diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c index 103ae293a3a4..dda713196071 100644 --- a/drivers/usb/storage/usb.c +++ b/drivers/usb/storage/usb.c @@ -420,11 +420,6 @@ static int usb_stor_add_blkdev(struct us_data *us, unsigned char lun) goto BadDevice; } - /* create partitions on demand */ - result = parse_partition_table(&pblk_dev->blk); - if (result != 0) - dev_warn(dev, "No partition table found\n"); - list_add_tail(&pblk_dev->list, &us->blk_dev_list); dev_dbg(dev, "USB disk device successfully added\n"); -- 2.39.2
