Skip to contentSkip to conversation

OPP: Properly propagate error along when failing to get icc_path

PATCH Applied Andrew Halaney 2 participants 2 messages Jun 26, 2023 – Jun 27, 2023 Operating performance points (OPP)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 OPP: Properly propagate error along when failing to get icc_path

fa155f4f8348 ("OPP: Use dev_err_probe() when failing to get icc_path") failed to actually use the error it was trying to log:

smatch warnings:
drivers/opp/of.c:516 dev_pm_opp_of_find_icc_paths() warn: passing zero to 'dev_err_probe'

Make sure to use the right error and pass it along.

Fixes fa155f4f8348 ("OPP: Use dev_err_probe() when failing to get icc_path")

---

This slip up was totally my fault, apologies. I've got a "dirty" working tree (where I made this enhancement while debugging) and a clean tree for submitting patches along the way. It looks like I made a slight change in the patch that was sent in the clean tree, then rebuilt and tested the dirty tree and sent it off.

Won't happen again, embarrassed to admit I sent a patch that was not properly tested but oh well. Here's a fix.

Thanks,
Andrew

 drivers/opp/of.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/opp/of.c +1 -1
index 1f0923cc1cd9..ada4963c7cfa 100644
@@ -513,7 +513,7 @@ int dev_pm_opp_of_find_icc_paths(struct device *dev,
 	for (i = 0; i < num_paths; i++) {
 		paths[i] = of_icc_get_by_index(dev, i);
 		if (IS_ERR(paths[i])) {
-			ret = dev_err_probe(dev, ret, "%s: Unable to get path%d\n", __func__, i);
+			ret = dev_err_probe(dev, PTR_ERR(paths[i]), "%s: Unable to get path%d\n", __func__, i);
 			goto err;
 		}
 	}
Signature · 1 line
2.40.1
Applied
#1 lore raw
Quoted 6 lines · Andrew Halaney

fa155f4f8348 ("OPP: Use dev_err_probe() when failing to get icc_path") failed to actually use the error it was trying to log:

smatch warnings:
drivers/opp/of.c:516 dev_pm_opp_of_find_icc_paths() warn: passing zero to 'dev_err_probe'

Quoted 7 lines

Make sure to use the right error and pass it along.

Fixes fa155f4f8348 ("OPP: Use dev_err_probe() when failing to get icc_path")

Applied. Thanks.

Signature · 1 line
viresh