Skip to content

Commit e143370

Browse files
krzkmathieupoirier
authored andcommitted
remoteproc: da8xx: 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> Link: https://lore.kernel.org/r/20241011-remote-proc-dev-err-probe-v1-2-5abb4fc61eca@linaro.org Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
1 parent fe03acd commit e143370

1 file changed

Lines changed: 6 additions & 16 deletions

File tree

drivers/remoteproc/da8xx_remoteproc.c

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,8 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
251251
return irq;
252252

253253
irq_data = irq_get_irq_data(irq);
254-
if (!irq_data) {
255-
dev_err(dev, "irq_get_irq_data(%d): NULL\n", irq);
256-
return -EINVAL;
257-
}
254+
if (!irq_data)
255+
return dev_err_probe(dev, -EINVAL, "irq_get_irq_data(%d): NULL\n", irq);
258256

259257
bootreg = devm_platform_ioremap_resource_byname(pdev, "host1cfg");
260258
if (IS_ERR(bootreg))
@@ -269,21 +267,13 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
269267
return dev_err_probe(dev, PTR_ERR(dsp_clk), "clk_get error\n");
270268

271269
dsp_reset = devm_reset_control_get_exclusive(dev, NULL);
272-
if (IS_ERR(dsp_reset)) {
273-
if (PTR_ERR(dsp_reset) != -EPROBE_DEFER)
274-
dev_err(dev, "unable to get reset control: %ld\n",
275-
PTR_ERR(dsp_reset));
276-
277-
return PTR_ERR(dsp_reset);
278-
}
270+
if (IS_ERR(dsp_reset))
271+
return dev_err_probe(dev, PTR_ERR(dsp_reset), "unable to get reset control\n");
279272

280273
if (dev->of_node) {
281274
ret = of_reserved_mem_device_init(dev);
282-
if (ret) {
283-
dev_err(dev, "device does not have specific CMA pool: %d\n",
284-
ret);
285-
return ret;
286-
}
275+
if (ret)
276+
return dev_err_probe(dev, ret, "device does not have specific CMA pool\n");
287277
}
288278

289279
rproc = rproc_alloc(dev, "dsp", &da8xx_rproc_ops, da8xx_fw_name,

0 commit comments

Comments
 (0)