spi: sprd: 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>
Acked-by: Chunyan Zhang <zhang.lyra@gmail.com>
Link: https://lore.kernel.org/r/20200910160706.5883-1-krzk@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-sprd-adi.c b/drivers/spi/spi-sprd-adi.c
index 127b8bd258312770a1ba15a60d4b5d64f279d171..392ec5cfa3d61e41979dc1d116587c4e9fd1875a 100644 (file)
--- a/drivers/spi/spi-sprd-adi.c
+++ b/drivers/spi/spi-sprd-adi.c
@@ -504,10 +504,7 @@ static int sprd_adi_probe(struct platform_device *pdev)
                        dev_info(&pdev->dev, "no hardware spinlock supplied\n");
                        break;
                default:
-                       dev_err(&pdev->dev,
-                               "failed to find hwlock id, %d\n", ret);
-                       fallthrough;
-               case -EPROBE_DEFER:
+                       dev_err_probe(&pdev->dev, ret, "failed to find hwlock id\n");
                        goto put_ctlr;
                }
        }

diff --git a/drivers/spi/spi-sprd.c b/drivers/spi/spi-sprd.c
index 0443fec3a6ab54e7ca4b36514e6844ad537f8e88..635738f54c73188450aceac52e1d7bc16b6c4d8f 100644 (file)
--- a/drivers/spi/spi-sprd.c
+++ b/drivers/spi/spi-sprd.c
@@ -553,22 +553,15 @@ static int sprd_spi_dma_tx_config(struct sprd_spi *ss, struct spi_transfer *t)
 static int sprd_spi_dma_request(struct sprd_spi *ss)
 {
        ss->dma.dma_chan[SPRD_SPI_RX] = dma_request_chan(ss->dev, "rx_chn");
-       if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPRD_SPI_RX])) {
-               if (PTR_ERR(ss->dma.dma_chan[SPRD_SPI_RX]) == -EPROBE_DEFER)
-                       return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_RX]);
-
-               dev_err(ss->dev, "request RX DMA channel failed!\n");
-               return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_RX]);
-       }
+       if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPRD_SPI_RX]))
+               return dev_err_probe(ss->dev, PTR_ERR(ss->dma.dma_chan[SPRD_SPI_RX]),
+                                    "request RX DMA channel failed!\n");
 
        ss->dma.dma_chan[SPRD_SPI_TX]  = dma_request_chan(ss->dev, "tx_chn");
        if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPRD_SPI_TX])) {
                dma_release_channel(ss->dma.dma_chan[SPRD_SPI_RX]);
-               if (PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]) == -EPROBE_DEFER)
-                       return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]);
-
-               dev_err(ss->dev, "request TX DMA channel failed!\n");
-               return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]);
+               return dev_err_probe(ss->dev, PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]),
+                                    "request TX DMA channel failed!\n");
        }
 
        return 0;