Skip to contentSkip to conversation

cmd: clk: Handle ENODEV from clk_get_rate

PATCH Superseded Ismael Luceno Cortes 2 participants 3 messages Feb 22, 2019 – Mar 18, 2019

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 cmd: clk: Handle ENODEV from clk_get_rate

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

---

CC Matthias Brugger <[email protected]>

Notes:
Changes since v2:

- Further improved commit message.

Changes since v1:

- Added further explanation to the commit message.

 cmd/clk.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)
cmd/clk.c +13 -10
index fd4231589c..41f2ae0a50 100644
@@ -26,20 +26,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;
 
+		ulong 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;
Signature · 1 line
2.19.1
#2 lore raw

PATCH v3 1/1 cmd: clk: Handle ENODEV from clk_get_rate

In reply to Ismael Luceno Cortes
Quoted 41 lines · Ismael Luceno Cortes

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

---

CC Matthias Brugger <[email protected]>

Notes:
Changes since v2:

- Further improved commit message.

Changes since v1:

- Added further explanation to the commit message.

 cmd/clk.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)
cmd/clk.c +2 -4
index fd4231589c..41f2ae0a50 100644
@@ -26,20 +26,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);

cmd/clk.c int __weak soc_clk_dump(void) · line 36

Quoted 10 lines
cmd/clk.c +3 -6
-		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;
 
+		ulong rate = clk_get_rate(&clk);

Please declare your variables at the beginning of the function.

Otherwise looks good,

Send a V2, CC Tom, collect my R-B and this can go into current release as a fix.

Quoted 13 lines
cmd/clk.c +8 -0
 		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;
Signature · 2 lines
Best regards,
Marek Vasut