Skip to content

Commit 63b07ee

Browse files
krzkandersson
authored andcommitted
remoteproc: qcom_q6v5_mss: Simplify with dev_err_probe()
Use dev_err_probe() to make error and defer code handling simpler. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Link: https://lore.kernel.org/r/20241011-remote-proc-dev-err-probe-v1-6-5abb4fc61eca@linaro.org Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent 85865e8 commit 63b07ee

File tree

1 file changed

+8
-16
lines changed

1 file changed

+8
-16
lines changed

drivers/remoteproc/qcom_q6v5_mss.c

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -261,21 +261,17 @@ enum {
261261
static int q6v5_regulator_init(struct device *dev, struct reg_info *regs,
262262
const struct qcom_mss_reg_res *reg_res)
263263
{
264-
int rc;
265264
int i;
266265

267266
if (!reg_res)
268267
return 0;
269268

270269
for (i = 0; reg_res[i].supply; i++) {
271270
regs[i].reg = devm_regulator_get(dev, reg_res[i].supply);
272-
if (IS_ERR(regs[i].reg)) {
273-
rc = PTR_ERR(regs[i].reg);
274-
if (rc != -EPROBE_DEFER)
275-
dev_err(dev, "Failed to get %s\n regulator",
276-
reg_res[i].supply);
277-
return rc;
278-
}
271+
if (IS_ERR(regs[i].reg))
272+
return dev_err_probe(dev, PTR_ERR(regs[i].reg),
273+
"Failed to get %s\n regulator",
274+
reg_res[i].supply);
279275

280276
regs[i].uV = reg_res[i].uV;
281277
regs[i].uA = reg_res[i].uA;
@@ -1813,14 +1809,10 @@ static int q6v5_init_clocks(struct device *dev, struct clk **clks,
18131809

18141810
for (i = 0; clk_names[i]; i++) {
18151811
clks[i] = devm_clk_get(dev, clk_names[i]);
1816-
if (IS_ERR(clks[i])) {
1817-
int rc = PTR_ERR(clks[i]);
1818-
1819-
if (rc != -EPROBE_DEFER)
1820-
dev_err(dev, "Failed to get %s clock\n",
1821-
clk_names[i]);
1822-
return rc;
1823-
}
1812+
if (IS_ERR(clks[i]))
1813+
return dev_err_probe(dev, PTR_ERR(clks[i]),
1814+
"Failed to get %s clock\n",
1815+
clk_names[i]);
18241816
}
18251817

18261818
return i;

0 commit comments

Comments
 (0)