[U-Boot] [PATCH v4] cmd: clk: Handle ENODEV from clk_get_rate

Ismael Luceno Cortes ismael.luceno at silicon-gears.com
Mon Mar 18 12:27:32 UTC 2019


clk_get_rate may return -ENODEV if the clock isn't valid.

Also, make the error cases go through a single path.

Fixes: ff8eee0330a6 ("cmd: clk: Add trivial implementation of clock dump
	for DM")

Signed-off-by: Ismael Luceno <ismael.luceno at silicon-gears.com>
Reviewed-by: Matthias Brugger <mbrugger at suse.com>
Reviewed-by: Marek Vasut <marek.vasut at gmail.com>
---

Notes:
    Changes since v3:
    - Moved the "rate" variable declaration to the begining of the function.
    
    Changes since v2:
    - Further improved commit message.
    
    Changes since v1:
    - Added further explanation to the commit message.

 cmd/clk.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/cmd/clk.c b/cmd/clk.c
index fd4231589c..5402c87de7 100644
--- a/cmd/clk.c
+++ b/cmd/clk.c
@@ -17,6 +17,7 @@ int __weak soc_clk_dump(void)
 	struct uclass *uc;
 	struct clk clk;
 	int ret;
+	ulong rate;
 
 	/* Device addresses start at 1 */
 	ret = uclass_get(UCLASS_CLK, &uc);
@@ -26,20 +27,23 @@ int __weak soc_clk_dump(void)
 	uclass_foreach_dev(dev, uc) {
 		memset(&clk, 0, sizeof(clk));
 		ret = device_probe(dev);
-		if (ret) {
-			printf("%-30.30s : ? Hz\n", dev->name);
-			continue;
-		}
+		if (ret)
+			goto noclk;
 
 		ret = clk_request(dev, &clk);
-		if (ret) {
-			printf("%-30.30s : ? Hz\n", dev->name);
-			continue;
-		}
-
-		printf("%-30.30s : %lu Hz\n", dev->name, clk_get_rate(&clk));
+		if (ret)
+			goto noclk;
 
+		rate = clk_get_rate(&clk);
 		clk_free(&clk);
+
+		if (rate == -ENODEV)
+			goto noclk;
+
+		printf("%-30.30s : %lu Hz\n", dev->name, rate);
+		continue;
+	noclk:
+		printf("%-30.30s : ? Hz\n", dev->name);
 	}
 
 	return 0;

base-commit: 9ba5e5bc261a16f51662490da0cf620dc7f29013
-- 
2.19.1


More information about the U-Boot mailing list