dmaengine: pl330: Simplify with dev_err_probe()
authorKrzysztof Kozlowski <krzk@kernel.org>
Fri, 28 Aug 2020 15:26:35 +0000 (17:26 +0200)
committerVinod Koul <vkoul@kernel.org>
Thu, 3 Sep 2020 07:08:59 +0000 (12:38 +0530)
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 <krzk@kernel.org>
Link: https://lore.kernel.org/r/20200828152637.16903-1-krzk@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/pl330.c

index 591867e..f3e6776 100644 (file)
@@ -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");
        if (IS_ERR(pl330->rstc)) {
-               if (PTR_ERR(pl330->rstc) != -EPROBE_DEFER)
-                       dev_err(&adev->dev, "Failed to get reset!\n");
-               return PTR_ERR(pl330->rstc);
+               return dev_err_probe(&adev->dev, PTR_ERR(pl330->rstc), "Failed to get reset!\n");
        } else {
                ret = reset_control_deassert(pl330->rstc);
                if (ret) {
@@ -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");
        if (IS_ERR(pl330->rstc_ocp)) {
-               if (PTR_ERR(pl330->rstc_ocp) != -EPROBE_DEFER)
-                       dev_err(&adev->dev, "Failed to get OCP reset!\n");
-               return PTR_ERR(pl330->rstc_ocp);
+               return dev_err_probe(&adev->dev, PTR_ERR(pl330->rstc_ocp),
+                                    "Failed to get OCP reset!\n");
        } else {
                ret = reset_control_deassert(pl330->rstc_ocp);
                if (ret) {