mmc: dw_mmc-zx: Simplify with dev_err_probe()
authorKrzysztof Kozlowski <krzk@kernel.org>
Wed, 2 Sep 2020 19:36:50 +0000 (21:36 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 7 Sep 2020 07:11:33 +0000 (09:11 +0200)
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/20200902193658.20539-4-krzk@kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/dw_mmc-zx.c

index eada648..d9e4834 100644 (file)
@@ -155,7 +155,6 @@ static int dw_mci_zx_parse_dt(struct dw_mci *host)
        struct device_node *node;
        struct dw_mci_zx_priv_data *priv;
        struct regmap *sysc_base;
-       int ret;
 
        /* syscon is needed only by emmc */
        node = of_parse_phandle(np, "zte,aon-syscon", 0);
@@ -163,13 +162,9 @@ static int dw_mci_zx_parse_dt(struct dw_mci *host)
                sysc_base = syscon_node_to_regmap(node);
                of_node_put(node);
 
-               if (IS_ERR(sysc_base)) {
-                       ret = PTR_ERR(sysc_base);
-                       if (ret != -EPROBE_DEFER)
-                               dev_err(host->dev, "Can't get syscon: %d\n",
-                                       ret);
-                       return ret;
-               }
+               if (IS_ERR(sysc_base))
+                       return dev_err_probe(host->dev, PTR_ERR(sysc_base),
+                                            "Can't get syscon\n");
        } else {
                return 0;
        }