From: Simon Glass <sjg@chromium.org>
Date: Sat, 30 Jul 2022 21:52:20 +0000 (-0600)
Subject: bootstd: Tidy up var naming in bootdev_setup_iter_order()
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=a18686cda14cf0281a00fe1cd44c2647d351d4aa;p=u-boot.git

bootstd: Tidy up var naming in bootdev_setup_iter_order()

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>
---

diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c
index 1ede933c2f..5683006c73 100644
--- a/boot/bootdev-uclass.c
+++ b/boot/bootdev-uclass.c
@@ -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;