leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disk: Rename block_dev to desc

Browse Source 
The use of 'block_dev' in this context is confusing, since it is not a
pointer to a device, just to some information about it. Rename this to
'desc', as is more commonly used, since it is a block descriptor.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Heinrich Schuchardt <xypron.glplk@gmx.de>
This commit is contained in:
Simon Glass 2022-10-20 18:22:53 -06:00 committed by Tom Rini
parent 76c839fcb4
commit b55afa0c0e
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
disk/disk-uclass.c
View File

@ -151,34 +151,34 @@ U_BOOT_DRIVER(blk_partition) = {
*/ */
static struct blk_desc *dev_get_blk(struct udevice *dev) static struct blk_desc *dev_get_blk(struct udevice *dev)
{ {
struct blk_desc *block_dev; struct blk_desc *desc;
switch (device_get_uclass_id(dev)) { switch (device_get_uclass_id(dev)) {
/* /*
* We won't support UCLASS_BLK with dev_* interfaces. * We won't support UCLASS_BLK with dev_* interfaces.
*/ */
case UCLASS_PARTITION: case UCLASS_PARTITION:
block_dev = dev_get_uclass_plat(dev_get_parent(dev)); desc = dev_get_uclass_plat(dev_get_parent(dev));
break; break;
default: default:
block_dev = NULL; desc = NULL;
break; break;
} }
return block_dev; return desc;
} }
unsigned long disk_blk_read(struct udevice *dev, lbaint_t start, unsigned long disk_blk_read(struct udevice *dev, lbaint_t start,
lbaint_t blkcnt, void *buffer) lbaint_t blkcnt, void *buffer)
{ {
struct blk_desc *block_dev; struct blk_desc *desc;
const struct blk_ops *ops; const struct blk_ops *ops;
struct disk_part *part; struct disk_part *part;
lbaint_t start_in_disk; lbaint_t start_in_disk;
ulong blks_read; ulong blks_read;
block_dev = dev_get_blk(dev); desc = dev_get_blk(dev);
if (!block_dev) if (!desc)
return -ENOSYS; return -ENOSYS;
ops = blk_get_ops(dev); ops = blk_get_ops(dev);
@ -191,13 +191,13 @@ unsigned long disk_blk_read(struct udevice *dev, lbaint_t start,
start_in_disk += part->gpt_part_info.start; start_in_disk += part->gpt_part_info.start;
} }
if (blkcache_read(block_dev->uclass_id, block_dev->devnum, if (blkcache_read(desc->uclass_id, desc->devnum, start_in_disk, blkcnt,
start_in_disk, blkcnt, block_dev->blksz, buffer)) desc->blksz, buffer))
return blkcnt; return blkcnt;
blks_read = ops->read(dev, start, blkcnt, buffer); blks_read = ops->read(dev, start, blkcnt, buffer);
if (blks_read == blkcnt) if (blks_read == blkcnt)
blkcache_fill(block_dev->uclass_id, block_dev->devnum, blkcache_fill(desc->uclass_id, desc->devnum, start_in_disk,
start_in_disk, blkcnt, block_dev->blksz, buffer); blkcnt, desc->blksz, buffer);
return blks_read; return blks_read;
} }
@ -205,18 +205,18 @@ unsigned long disk_blk_read(struct udevice *dev, lbaint_t start,
unsigned long disk_blk_write(struct udevice *dev, lbaint_t start, unsigned long disk_blk_write(struct udevice *dev, lbaint_t start,
lbaint_t blkcnt, const void *buffer) lbaint_t blkcnt, const void *buffer)
{ {
struct blk_desc *block_dev; struct blk_desc *desc;
const struct blk_ops *ops; const struct blk_ops *ops;
block_dev = dev_get_blk(dev); desc = dev_get_blk(dev);
if (!block_dev) if (!desc)
return -ENOSYS; return -ENOSYS;
ops = blk_get_ops(dev); ops = blk_get_ops(dev);
if (!ops->write) if (!ops->write)
return -ENOSYS; return -ENOSYS;
blkcache_invalidate(block_dev->uclass_id, block_dev->devnum); blkcache_invalidate(desc->uclass_id, desc->devnum);
return ops->write(dev, start, blkcnt, buffer); return ops->write(dev, start, blkcnt, buffer);
} }
@ -224,18 +224,18 @@ unsigned long disk_blk_write(struct udevice *dev, lbaint_t start,
unsigned long disk_blk_erase(struct udevice *dev, lbaint_t start, unsigned long disk_blk_erase(struct udevice *dev, lbaint_t start,
lbaint_t blkcnt) lbaint_t blkcnt)
{ {
struct blk_desc *block_dev; struct blk_desc *desc;
const struct blk_ops *ops; const struct blk_ops *ops;
block_dev = dev_get_blk(dev); desc = dev_get_blk(dev);
if (!block_dev) if (!desc)
return -ENOSYS; return -ENOSYS;
ops = blk_get_ops(dev); ops = blk_get_ops(dev);
if (!ops->erase) if (!ops->erase)
return -ENOSYS; return -ENOSYS;
blkcache_invalidate(block_dev->uclass_id, block_dev->devnum); blkcache_invalidate(desc->uclass_id, desc->devnum);
return ops->erase(dev, start, blkcnt); return ops->erase(dev, start, blkcnt);
} }