]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
efi: Drop unnecessary calls to blk_find_device()
authorSimon Glass <sjg@chromium.org>
Sat, 29 Jan 2022 21:58:39 +0000 (14:58 -0700)
committerHeinrich Schuchardt <heinrich.schuchardt@canonical.com>
Sat, 5 Feb 2022 19:20:01 +0000 (20:20 +0100)
When we have the block descriptor we can simply access the device. Drop
the unnecessary function call.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
lib/efi_loader/efi_device_path.c

index 75ab4de70706043fc94f558b050798b3efc49d9c..dc787b4d3dded0143421deb30e13a6e62244dd4b 100644 (file)
@@ -769,13 +769,8 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev)
 static unsigned dp_part_size(struct blk_desc *desc, int part)
 {
        unsigned dpsize;
-       struct udevice *dev;
-       int ret;
+       struct udevice *dev = desc->bdev;
 
-       ret = blk_find_device(desc->if_type, desc->devnum, &dev);
-
-       if (ret)
-               dev = desc->bdev->parent;
        dpsize = dp_size(dev);
 
        if (part == 0) /* the actual disk, not a partition */
@@ -866,13 +861,8 @@ static void *dp_part_node(void *buf, struct blk_desc *desc, int part)
  */
 static void *dp_part_fill(void *buf, struct blk_desc *desc, int part)
 {
-       struct udevice *dev;
-       int ret;
-
-       ret = blk_find_device(desc->if_type, desc->devnum, &dev);
+       struct udevice *dev = desc->bdev;
 
-       if (ret)
-               dev = desc->bdev->parent;
        buf = dp_fill(buf, dev);
 
        if (part == 0) /* the actual disk, not a partition */