From 6eace9f6cade19b379bdb9aed5834ed74e8d0804 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 3 Apr 2023 10:43:37 -0400 Subject: [PATCH] Revert "disk: Use a helper function to reduce duplication" Per Takahiro Akashi this is not an equivalent rework, so revert it. This reverts commit 8fa25e01d873a4f9fb6664f721951799f9361841. Signed-off-by: Tom Rini --- disk/disk-uclass.c | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/disk/disk-uclass.c b/disk/disk-uclass.c index 7f1fd80b22..d32747e224 100644 --- a/disk/disk-uclass.c +++ b/disk/disk-uclass.c @@ -65,38 +65,26 @@ int part_create_block_devices(struct udevice *blk_dev) return 0; } -static int blk_part_setup(struct udevice *dev, lbaint_t *startp, - lbaint_t blkcnt) -{ - struct disk_part *part; - - part = dev_get_uclass_plat(dev); - if (*startp >= part->gpt_part_info.size) - return -E2BIG; - - if (*startp + blkcnt > part->gpt_part_info.size) - blkcnt = part->gpt_part_info.size - *startp; - *startp += part->gpt_part_info.start; - - return 0; -} - static ulong part_blk_read(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, void *buffer) { struct udevice *parent; + struct disk_part *part; const struct blk_ops *ops; - int ret; parent = dev_get_parent(dev); ops = blk_get_ops(parent); if (!ops->read) return -ENOSYS; - ret = blk_part_setup(dev, &start, blkcnt); - if (ret) + part = dev_get_uclass_plat(dev); + if (start >= part->gpt_part_info.size) return 0; + if ((start + blkcnt) > part->gpt_part_info.size) + blkcnt = part->gpt_part_info.size - start; + start += part->gpt_part_info.start; + return ops->read(parent, start, blkcnt, buffer); } @@ -104,18 +92,22 @@ static ulong part_blk_write(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, const void *buffer) { struct udevice *parent; + struct disk_part *part; const struct blk_ops *ops; - int ret; parent = dev_get_parent(dev); ops = blk_get_ops(parent); if (!ops->write) return -ENOSYS; - ret = blk_part_setup(dev, &start, blkcnt); - if (ret) + part = dev_get_uclass_plat(dev); + if (start >= part->gpt_part_info.size) return 0; + if ((start + blkcnt) > part->gpt_part_info.size) + blkcnt = part->gpt_part_info.size - start; + start += part->gpt_part_info.start; + return ops->write(parent, start, blkcnt, buffer); } @@ -123,18 +115,22 @@ static ulong part_blk_erase(struct udevice *dev, lbaint_t start, lbaint_t blkcnt) { struct udevice *parent; + struct disk_part *part; const struct blk_ops *ops; - int ret; parent = dev_get_parent(dev); ops = blk_get_ops(parent); if (!ops->erase) return -ENOSYS; - ret = blk_part_setup(dev, &start, blkcnt); - if (ret) + part = dev_get_uclass_plat(dev); + if (start >= part->gpt_part_info.size) return 0; + if ((start + blkcnt) > part->gpt_part_info.size) + blkcnt = part->gpt_part_info.size - start; + start += part->gpt_part_info.start; + return ops->erase(parent, start, blkcnt); } -- 2.39.5