summaryrefslogtreecommitdiff
path: root/disk
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2023-03-19 22:29:57 +0300
committerTom Rini <trini@konsulko.com>2023-03-30 22:09:59 +0300
commitd87bdb82eae66512c222fd93280acaf4dd1cd4be (patch)
treeb4fd112eed3b4fbb38454e463244fe0c88326aaa /disk
parentc61df34009c3ad46b5798e1d13fd640419bf17e6 (diff)
downloadu-boot-d87bdb82eae66512c222fd93280acaf4dd1cd4be.tar.xz
disk: Use a helper function to reduce duplication
Reduce the duplicated code slightly by using a helper function to handle the common code. This reduces the code size very slightly. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'disk')
-rw-r--r--disk/disk-uclass.c46
1 files changed, 25 insertions, 21 deletions
diff --git a/disk/disk-uclass.c b/disk/disk-uclass.c
index d32747e224..7f1fd80b22 100644
--- a/disk/disk-uclass.c
+++ b/disk/disk-uclass.c
@@ -65,26 +65,38 @@ 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;
- part = dev_get_uclass_plat(dev);
- if (start >= part->gpt_part_info.size)
+ ret = blk_part_setup(dev, &start, blkcnt);
+ if (ret)
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);
}
@@ -92,22 +104,18 @@ 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;
- part = dev_get_uclass_plat(dev);
- if (start >= part->gpt_part_info.size)
+ ret = blk_part_setup(dev, &start, blkcnt);
+ if (ret)
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);
}
@@ -115,22 +123,18 @@ 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;
- part = dev_get_uclass_plat(dev);
- if (start >= part->gpt_part_info.size)
+ ret = blk_part_setup(dev, &start, blkcnt);
+ if (ret)
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);
}