spi: s3c64xx: simplify if statement in prepare_transfer function

The whole function is inside an 'if' statement
("!is_polling(sdd)").

Check the opposite of that statement at the beginning and exit,
this way we can have one level less of indentation.

Remove the goto paths as they are redundant.

Signed-off-by: Andi Shyti <andi.shyti@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index c65a9e6baefd79642444f5e1b830539aa0f0d17a..6d8486fc668fc59d58238555477622542a43f3d3 100644 (file)
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -341,38 +341,32 @@ static int s3c64xx_spi_prepare_transfer(struct spi_master *spi)
        dma_filter_fn filter = sdd->cntrlr_info->filter;
        struct device *dev = &sdd->pdev->dev;
        dma_cap_mask_t mask;
-       int ret;
 
-       if (!is_polling(sdd)) {
-               dma_cap_zero(mask);
-               dma_cap_set(DMA_SLAVE, mask);
-
-               /* Acquire DMA channels */
-               sdd->rx_dma.ch = dma_request_slave_channel_compat(mask, filter,
-                                  sdd->cntrlr_info->dma_rx, dev, "rx");
-               if (!sdd->rx_dma.ch) {
-                       dev_err(dev, "Failed to get RX DMA channel\n");
-                       ret = -EBUSY;
-                       goto out;
-               }
-               spi->dma_rx = sdd->rx_dma.ch;
-
-               sdd->tx_dma.ch = dma_request_slave_channel_compat(mask, filter,
-                                  sdd->cntrlr_info->dma_tx, dev, "tx");
-               if (!sdd->tx_dma.ch) {
-                       dev_err(dev, "Failed to get TX DMA channel\n");
-                       ret = -EBUSY;
-                       goto out_rx;
-               }
-               spi->dma_tx = sdd->tx_dma.ch;
+       if (is_polling(sdd))
+               return 0;
+
+       dma_cap_zero(mask);
+       dma_cap_set(DMA_SLAVE, mask);
+
+       /* Acquire DMA channels */
+       sdd->rx_dma.ch = dma_request_slave_channel_compat(mask, filter,
+                          sdd->cntrlr_info->dma_rx, dev, "rx");
+       if (!sdd->rx_dma.ch) {
+               dev_err(dev, "Failed to get RX DMA channel\n");
+               return -EBUSY;
        }
+       spi->dma_rx = sdd->rx_dma.ch;
 
-       return 0;
+       sdd->tx_dma.ch = dma_request_slave_channel_compat(mask, filter,
+                          sdd->cntrlr_info->dma_tx, dev, "tx");
+       if (!sdd->tx_dma.ch) {
+               dev_err(dev, "Failed to get TX DMA channel\n");
+               dma_release_channel(sdd->rx_dma.ch);
+               return -EBUSY;
+       }
+       spi->dma_tx = sdd->tx_dma.ch;
 
-out_rx:
-       dma_release_channel(sdd->rx_dma.ch);
-out:
-       return ret;
+       return 0;
 }
 
 static int s3c64xx_spi_unprepare_transfer(struct spi_master *spi)