Skip to content

Commit 543256d

Browse files
krzkvireshk
authored andcommitted
PM: opp: simplify with dev_err_probe()
Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
1 parent 907ed12 commit 543256d

1 file changed

Lines changed: 5 additions & 9 deletions

File tree

drivers/opp/core.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2019,10 +2019,9 @@ struct opp_table *dev_pm_opp_set_regulators(struct device *dev,
20192019
for (i = 0; i < count; i++) {
20202020
reg = regulator_get_optional(dev, names[i]);
20212021
if (IS_ERR(reg)) {
2022-
ret = PTR_ERR(reg);
2023-
if (ret != -EPROBE_DEFER)
2024-
dev_err(dev, "%s: no regulator (%s) found: %d\n",
2025-
__func__, names[i], ret);
2022+
ret = dev_err_probe(dev, PTR_ERR(reg),
2023+
"%s: no regulator (%s) found\n",
2024+
__func__, names[i]);
20262025
goto free_regulators;
20272026
}
20282027

@@ -2168,11 +2167,8 @@ struct opp_table *dev_pm_opp_set_clkname(struct device *dev, const char *name)
21682167
/* Find clk for the device */
21692168
opp_table->clk = clk_get(dev, name);
21702169
if (IS_ERR(opp_table->clk)) {
2171-
ret = PTR_ERR(opp_table->clk);
2172-
if (ret != -EPROBE_DEFER) {
2173-
dev_err(dev, "%s: Couldn't find clock: %d\n", __func__,
2174-
ret);
2175-
}
2170+
ret = dev_err_probe(dev, PTR_ERR(opp_table->clk),
2171+
"%s: Couldn't find clock\n", __func__);
21762172
goto err;
21772173
}
21782174

0 commit comments

Comments
 (0)