spi: tegra114: Simplify with dev_err_probe()
authorKrzysztof Kozlowski <krzk@kernel.org>
Tue, 1 Sep 2020 15:27:12 +0000 (17:27 +0200)
committerMark Brown <broonie@kernel.org>
Tue, 8 Sep 2020 17:19:30 +0000 (18:19 +0100)
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/20200901152713.18629-10-krzk@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-tegra114.c

index c2c5887..ca6886a 100644 (file)
@@ -664,16 +664,11 @@ static int tegra_spi_init_dma_param(struct tegra_spi_data *tspi,
        struct dma_chan *dma_chan;
        u32 *dma_buf;
        dma_addr_t dma_phys;
-       int ret;
 
        dma_chan = dma_request_chan(tspi->dev, dma_to_memory ? "rx" : "tx");
-       if (IS_ERR(dma_chan)) {
-               ret = PTR_ERR(dma_chan);
-               if (ret != -EPROBE_DEFER)
-                       dev_err(tspi->dev,
-                               "Dma channel is not available: %d\n", ret);
-               return ret;
-       }
+       if (IS_ERR(dma_chan))
+               return dev_err_probe(tspi->dev, PTR_ERR(dma_chan),
+                                    "Dma channel is not available\n");
 
        dma_buf = dma_alloc_coherent(tspi->dev, tspi->dma_buf_size,
                                &dma_phys, GFP_KERNEL);