From a1c456d199160dae463152858e5c1d642bcc811c Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 15 Jan 2025 18:27:02 -0700 Subject: [PATCH] vbe: Use blk_read() to read blocks We should not be using the old blk_d...() interface, is only there to aid migration to driver model. Move to blk_read() instead. Changes in v2: - Split patch into several pieces Signed-off-by: Simon Glass --- boot/vbe_simple.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/vbe_simple.c b/boot/vbe_simple.c index 189e86d2a22..dc4e98d13c5 100644 --- a/boot/vbe_simple.c +++ b/boot/vbe_simple.c @@ -44,7 +44,7 @@ static int simple_read_version(struct udevice *dev, struct blk_desc *desc, return log_msg_ret("get", -EBADF); start /= MMC_MAX_BLOCK_LEN; - if (blk_dread(desc, start, 1, buf) != 1) + if (blk_read(desc->bdev, start, 1, buf) != 1) return log_msg_ret("read", -EIO); strlcpy(state->fw_version, buf, MAX_VERSION_LEN); log_debug("version=%s\n", state->fw_version); @@ -68,7 +68,7 @@ static int simple_read_nvdata(struct udevice *dev, struct blk_desc *desc, return log_msg_ret("get", -EBADF); start /= MMC_MAX_BLOCK_LEN; - if (blk_dread(desc, start, 1, buf) != 1) + if (blk_read(desc->bdev, start, 1, buf) != 1) return log_msg_ret("read", -EIO); nvd = (struct simple_nvdata *)buf; hdr_ver = (nvd->hdr & NVD_HDR_VER_MASK) >> NVD_HDR_VER_SHIFT; -- 2.39.5