From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755492AbcFQIB3 (ORCPT ); Fri, 17 Jun 2016 04:01:29 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:56971 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754938AbcFQH5d (ORCPT ); Fri, 17 Jun 2016 03:57:33 -0400 X-AuditID: cbfee690-f79056d000001327-f2-5763ad697e72 From: Andi Shyti To: Mark Brown Cc: Kukjin Kim , Krzysztof Kozlowski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Andi Shyti , Andi Shyti Subject: [PATCH 5/5] spi: s3c63xx: simplify if statement in prepare_transfer function Date: Fri, 17 Jun 2016 16:57:25 +0900 Message-id: <1466150245-2648-6-git-send-email-andi.shyti@samsung.com> X-Mailer: git-send-email 2.8.1 In-reply-to: <1466150245-2648-1-git-send-email-andi.shyti@samsung.com> References: <1466150245-2648-1-git-send-email-andi.shyti@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrDLMWRmVeSWpSXmKPExsWyRsSkWDdzbXK4QcMLK4vtR56xWiz+8ZzJ YurDJ2wWr18YWvQ/fs1ssenxNVaLy7vmsFk0frzJ7sDhcX3JJ2aPTas62Tw2L6n36NuyitHj 8ya5ANYoLpuU1JzMstQifbsEroyTn6sKZgpV7J23g72B8Q1fFyMnh4SAicTOE3NZIWwxiQv3 1rOB2EICKxgl1jyJg6lZuamHCSI+i1HixALHLkYuIPsjo8Tvxf/AEmwCmhJNt3+ANYsIKEtc /b6XBaSIWeAno8TVO60sIAlhgXCJhRdWMoPYLAKqEou3PWMEsXkFXCW+rF3NDrFNTuLy9Adg gzgF3CQWXvkMVMMBtM1V4uJLTZCZEgKL2CX2LjrBDjFHQOLb5EMsIDUSArISmw4wQ4yRlDi4 4gbLBEbhBYwMqxhFUwuSC4qT0otM9IoTc4tL89L1kvNzNzECA/30v2cTdjDeO2B9iFGAg1GJ hzdCKjlciDWxrLgy9xCjKdCGicxSosn5wHjKK4k3NDYzsjA1MTU2Mrc0UxLnfS31M1hIID2x JDU7NbUgtSi+qDQntfgQIxMHp1QD48TClmTWOcVHPx57ePj+PkN3YYGpRhEnhM68vLs00S1Q tGF2fPnvsluvo8R2fv5ZnxXX9jnBh+nMA5NlS16/kfB5HiJsHBY16fv2OjePCOcz/1hPTePn Lb7pvl379m1n4fz/GodC31z+Yb/yeG3L3N63F3j3G9g76iWsF5qwTXHLWU7jA5pGd5VYijMS DbWYi4oTAfSA/4lvAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrFIsWRmVeSWpSXmKPExsVy+t9jQd3MtcnhBsu/mlpsP/KM1WLxj+dM FlMfPmGzeP3C0KL/8Wtmi02Pr7FaXN41h82i8eNNdgcOj+tLPjF7bFrVyeaxeUm9R9+WVYwe nzfJBbBGNTDaZKQmpqQWKaTmJeenZOal2yp5B8c7x5uaGRjqGlpamCsp5CXmptoqufgE6Lpl 5gCdoqRQlphTChQKSCwuVtK3wzQhNMRN1wKmMULXNyQIrsfIAA0krGHMOPm5qmCmUMXeeTvY Gxjf8HUxcnJICJhIrNzUwwRhi0lcuLeeDcQWEpjFKHFigWMXIxeQ/ZFR4vfif2BFbAKaEk23 f4AViQgoS1z9vpcFpIhZ4CejxNU7rSwgCWGBcImFF1Yyg9gsAqoSi7c9YwSxeQVcJb6sXc0O sU1O4vL0B2CDOAXcJBZe+QxUwwG0zVXi4kvNCYy8CxgZVjFKpBYkFxQnpeca5qWW6xUn5haX 5qXrJefnbmIEx9MzqR2MB3e5H2IU4GBU4uHdoZwcLsSaWFZcmXuIUYKDWUmEl3EVUIg3JbGy KrUoP76oNCe1+BCjKdBdE5mlRJPzgbGeVxJvaGxiZmRpZG5oYWRsriTO+/j/ujAhgfTEktTs 1NSC1CKYPiYOTqkGxqyuxmqHlsJcK6lFJezacpJ1119pViz1WOeW8eK4nmxjf2RAwnGR8H3X Xbk1ZW45MRkkb9T5LOsVfj7neOlU95T6x0kLpnDyKam8v7c75qk/a1Tsydgtz143ZEdyR3Pu NJ3+cu3Cb7eW3LFlfJydap53rV76YfhB8QvlbzWcI1Zv9jDtPztLiaU4I9FQi7moOBEAG3oh bb0CAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The whole function is in an if statement ("!is_polling(sdd)"). Check the opposite of that statement at the beginning and exit, this way we can have a level less of indentation. Remove the goto paths as they are redundant. Signed-off-by: Andi Shyti --- drivers/spi/spi-s3c64xx.c | 50 +++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index a98930a..c45c88c 100644 --- 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) -- 2.8.1