mtd: rawnand: qcom: 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: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20200901142535.12819-6-krzk@kernel.org

diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c
index 3d616e6..777fb0d 100644 (file)
--- a/drivers/mtd/nand/raw/qcom_nandc.c
+++ b/drivers/mtd/nand/raw/qcom_nandc.c
@@ -2702,10 +2702,8 @@ static int qcom_nandc_alloc(struct qcom_nand_controller *nandc)
                if (IS_ERR(nandc->tx_chan)) {
                        ret = PTR_ERR(nandc->tx_chan);
                        nandc->tx_chan = NULL;
-                       if (ret != -EPROBE_DEFER)
-                               dev_err(nandc->dev,
-                                       "tx DMA channel request failed: %d\n",
-                                       ret);
+                       dev_err_probe(nandc->dev, ret,
+                                     "tx DMA channel request failed\n");
                        goto unalloc;
                }
 
@@ -2713,10 +2711,8 @@ static int qcom_nandc_alloc(struct qcom_nand_controller *nandc)
                if (IS_ERR(nandc->rx_chan)) {
                        ret = PTR_ERR(nandc->rx_chan);
                        nandc->rx_chan = NULL;
-                       if (ret != -EPROBE_DEFER)
-                               dev_err(nandc->dev,
-                                       "rx DMA channel request failed: %d\n",
-                                       ret);
+                       dev_err_probe(nandc->dev, ret,
+                                     "rx DMA channel request failed\n");
                        goto unalloc;
                }
 
@@ -2724,10 +2720,8 @@ static int qcom_nandc_alloc(struct qcom_nand_controller *nandc)
                if (IS_ERR(nandc->cmd_chan)) {
                        ret = PTR_ERR(nandc->cmd_chan);
                        nandc->cmd_chan = NULL;
-                       if (ret != -EPROBE_DEFER)
-                               dev_err(nandc->dev,
-                                       "cmd DMA channel request failed: %d\n",
-                                       ret);
+                       dev_err_probe(nandc->dev, ret,
+                                     "cmd DMA channel request failed\n");
                        goto unalloc;
                }
 
@@ -2750,10 +2744,8 @@ static int qcom_nandc_alloc(struct qcom_nand_controller *nandc)
                if (IS_ERR(nandc->chan)) {
                        ret = PTR_ERR(nandc->chan);
                        nandc->chan = NULL;
-                       if (ret != -EPROBE_DEFER)
-                               dev_err(nandc->dev,
-                                       "rxtx DMA channel request failed: %d\n",
-                                       ret);
+                       dev_err_probe(nandc->dev, ret,
+                                     "rxtx DMA channel request failed\n");
                        return ret;
                }
        }