dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 08:42:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

disk: Use a helper function to reduce duplication

Browse Source 
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>
This commit is contained in:
Simon Glass
2023-03-20 08:29:57 +13:00
committed by Tom Rini
parent c61df34009
commit d87bdb82ea
1 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
disk/disk-uclass.c
View File

@@ -65,26 +65,38 @@ int part_create_block_devices(struct udevice *blk_dev)
return 0; 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, static ulong part_blk_read(struct udevice *dev, lbaint_t start,
lbaint_t blkcnt, void *buffer) lbaint_t blkcnt, void *buffer)
{ {
struct udevice *parent; struct udevice *parent;
struct disk_part *part;
const struct blk_ops *ops; const struct blk_ops *ops;
int ret;
parent = dev_get_parent(dev); parent = dev_get_parent(dev);
ops = blk_get_ops(parent); ops = blk_get_ops(parent);
if (!ops->read) if (!ops->read)
return -ENOSYS; return -ENOSYS;
part = dev_get_uclass_plat(dev); ret = blk_part_setup(dev, &start, blkcnt);
if (start >= part->gpt_part_info.size) if (ret)
return 0; 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); 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) lbaint_t blkcnt, const void *buffer)
{ {
struct udevice *parent; struct udevice *parent;
struct disk_part *part;
const struct blk_ops *ops; const struct blk_ops *ops;
int ret;
parent = dev_get_parent(dev); parent = dev_get_parent(dev);
ops = blk_get_ops(parent); ops = blk_get_ops(parent);
if (!ops->write) if (!ops->write)
return -ENOSYS; return -ENOSYS;
part = dev_get_uclass_plat(dev); ret = blk_part_setup(dev, &start, blkcnt);
if (start >= part->gpt_part_info.size) if (ret)
return 0; 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); 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) lbaint_t blkcnt)
{ {
struct udevice *parent; struct udevice *parent;
struct disk_part *part;
const struct blk_ops *ops; const struct blk_ops *ops;
int ret;
parent = dev_get_parent(dev); parent = dev_get_parent(dev);
ops = blk_get_ops(parent); ops = blk_get_ops(parent);
if (!ops->erase) if (!ops->erase)
return -ENOSYS; return -ENOSYS;
part = dev_get_uclass_plat(dev); ret = blk_part_setup(dev, &start, blkcnt);
if (start >= part->gpt_part_info.size) if (ret)
return 0; 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); return ops->erase(parent, start, blkcnt);
} }