diff options
| author | Tom Rini <trini@konsulko.com> | 2022-09-25 17:20:11 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-09-25 17:20:11 -0400 |
| commit | 9114b7cee817789ad59e0fb6d5cd57f50668b4e1 (patch) | |
| tree | a6bd3d83314fee80b1b1a2e9a39df39d96a2dcc8 /disk/disk-uclass.c | |
| parent | 81da5042e514bfd27516d3530dde4d62a6708ca4 (diff) | |
| parent | 22c80d5603ac4c58debc8c776b8f138e76cf5f7c (diff) | |
Merge tag 'dm-next-25sep22' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm into next
sandbox SCSI conversion to driver model
final patch for blk improvements
Diffstat (limited to 'disk/disk-uclass.c')
| -rw-r--r-- | disk/disk-uclass.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/disk/disk-uclass.c b/disk/disk-uclass.c index 9351a5cfa6..551f8b1dca 100644 --- a/disk/disk-uclass.c +++ b/disk/disk-uclass.c @@ -191,12 +191,12 @@ unsigned long dev_read(struct udevice *dev, lbaint_t start, start_in_disk += part->gpt_part_info.start; } - if (blkcache_read(block_dev->if_type, block_dev->devnum, + if (blkcache_read(block_dev->uclass_id, block_dev->devnum, start_in_disk, blkcnt, block_dev->blksz, buffer)) return blkcnt; blks_read = ops->read(dev, start, blkcnt, buffer); if (blks_read == blkcnt) - blkcache_fill(block_dev->if_type, block_dev->devnum, + blkcache_fill(block_dev->uclass_id, block_dev->devnum, start_in_disk, blkcnt, block_dev->blksz, buffer); return blks_read; @@ -216,7 +216,7 @@ unsigned long dev_write(struct udevice *dev, lbaint_t start, if (!ops->write) return -ENOSYS; - blkcache_invalidate(block_dev->if_type, block_dev->devnum); + blkcache_invalidate(block_dev->uclass_id, block_dev->devnum); return ops->write(dev, start, blkcnt, buffer); } @@ -235,7 +235,7 @@ unsigned long dev_erase(struct udevice *dev, lbaint_t start, if (!ops->erase) return -ENOSYS; - blkcache_invalidate(block_dev->if_type, block_dev->devnum); + blkcache_invalidate(block_dev->uclass_id, block_dev->devnum); return ops->erase(dev, start, blkcnt); } |