Commit af53bef5 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Vinod Koul

dmaengine: pl330: 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: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/20200828152637.16903-1-krzk@kernel.orgSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 5d7e816e
...@@ -3038,9 +3038,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) ...@@ -3038,9 +3038,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
pl330->rstc = devm_reset_control_get_optional(&adev->dev, "dma"); pl330->rstc = devm_reset_control_get_optional(&adev->dev, "dma");
if (IS_ERR(pl330->rstc)) { if (IS_ERR(pl330->rstc)) {
if (PTR_ERR(pl330->rstc) != -EPROBE_DEFER) return dev_err_probe(&adev->dev, PTR_ERR(pl330->rstc), "Failed to get reset!\n");
dev_err(&adev->dev, "Failed to get reset!\n");
return PTR_ERR(pl330->rstc);
} else { } else {
ret = reset_control_deassert(pl330->rstc); ret = reset_control_deassert(pl330->rstc);
if (ret) { if (ret) {
...@@ -3051,9 +3049,8 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) ...@@ -3051,9 +3049,8 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
pl330->rstc_ocp = devm_reset_control_get_optional(&adev->dev, "dma-ocp"); pl330->rstc_ocp = devm_reset_control_get_optional(&adev->dev, "dma-ocp");
if (IS_ERR(pl330->rstc_ocp)) { if (IS_ERR(pl330->rstc_ocp)) {
if (PTR_ERR(pl330->rstc_ocp) != -EPROBE_DEFER) return dev_err_probe(&adev->dev, PTR_ERR(pl330->rstc_ocp),
dev_err(&adev->dev, "Failed to get OCP reset!\n"); "Failed to get OCP reset!\n");
return PTR_ERR(pl330->rstc_ocp);
} else { } else {
ret = reset_control_deassert(pl330->rstc_ocp); ret = reset_control_deassert(pl330->rstc_ocp);
if (ret) { if (ret) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment