]> git.baikalelectronics.ru Git - uboot.git/commitdiff
bootstd: Tidy up var naming in bootdev_setup_iter_order()
authorSimon Glass <sjg@chromium.org>
Sat, 30 Jul 2022 21:52:20 +0000 (15:52 -0600)
committerTom Rini <trini@konsulko.com>
Fri, 12 Aug 2022 12:14:24 +0000 (08:14 -0400)
Avoid using 'count' to mean either a count or an error, since this is
confusing. In fact, the called function never return 0, since that is an
error.

Use 'ret' instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
boot/bootdev-uclass.c

index 1ede933c2f2efd87d182711225e91a4845684c93..5683006c73c6f6255377a79ca9ea19d12c544d01 100644 (file)
@@ -604,14 +604,14 @@ int bootdev_setup_iter_order(struct bootflow_iter *iter, struct udevice **devp)
                log_debug("Expected %d bootdevs, found %d using aliases\n",
                          count, upto);
 
-       count = build_order(bootstd, order, upto);
-       if (count < 0) {
+       ret = build_order(bootstd, order, upto);
+       if (ret < 0) {
                free(order);
-               return log_msg_ret("build", count);
+               return log_msg_ret("build", ret);
        }
 
+       iter->num_devs = ret;
        iter->dev_order = order;
-       iter->num_devs = count;
        iter->cur_dev = 0;
 
        dev = *order;