boot: set correct block device name in set_efi_bootdev()

For SATA devices the class name is 'ahci' but the block device name is
'sata'.

Use function blk_get_uclass_name() to retrieve the correct string.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/boot/bootmeth_efi.c b/boot/bootmeth_efi.c
index 39232eb2e25253e405e412132c9642fc14e02393..6b41c0999f1cf7f067191ee68c56a2574b29ceb2 100644 (file)
--- a/boot/bootmeth_efi.c
+++ b/boot/bootmeth_efi.c
@@ -100,11 +100,10 @@ static void set_efi_bootdev(struct blk_desc *desc, struct bootflow *bflow)
        if (last_slash)
                *last_slash = '\0';
 
-       log_debug("setting bootdev %s, %s, %s, %p, %x\n",
-                 dev_get_uclass_name(media_dev), devnum_str, bflow->fname,
-                 bflow->buf, size);
        dev_name = device_get_uclass_id(media_dev) == UCLASS_MASS_STORAGE ?
-                "usb" : dev_get_uclass_name(media_dev);
+                "usb" : blk_get_uclass_name(device_get_uclass_id(media_dev));
+       log_debug("setting bootdev %s, %s, %s, %p, %x\n",
+                 dev_name, devnum_str, bflow->fname, bflow->buf, size);
        efi_set_bootdev(dev_name, devnum_str, bflow->fname, bflow->buf, size);
 }