From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752165AbcF1CmT (ORCPT ); Mon, 27 Jun 2016 22:42:19 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:34444 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751764AbcF1CmJ (ORCPT ); Mon, 27 Jun 2016 22:42:09 -0400 X-AuditID: cbfee68d-f79876d000001436-b5-5771e3d87907 From: Andi Shyti To: Kukjin Kim , Krzysztof Kozlowski , Mark Brown Cc: Jaehoon Chung , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Andi Shyti , Andi Shyti Subject: [PATCH v2 4/5] spi: s3c64xx: simplify if statement in prepare_transfer function Date: Tue, 28 Jun 2016 11:41:14 +0900 Message-id: <1467081676-8442-5-git-send-email-andi.shyti@samsung.com> X-Mailer: git-send-email 2.8.1 In-reply-to: <1467081676-8442-1-git-send-email-andi.shyti@samsung.com> References: <1467081676-8442-1-git-send-email-andi.shyti@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrGLMWRmVeSWpSXmKPExsWyRsSkUPfm48Jwg9Y+RovtR56xWiz+8ZzJ YurDJ2wWN361sVq8fmFo0f/4NbPFpsfXWC0u75rDZjHj/D4mi8aPN9kduDyuL/nE7LFpVSeb x+Yl9R59W1YxenzeJBfAGsVlk5Kak1mWWqRvl8CVsf7SHuaCJUIVD9tvsjYwfuHrYuTkkBAw kdi5dSk7hC0mceHeejYQW0hgBaPEz6UKMDUTZi0CinMBxWcxSsw99QHK+cgo0fj5AgtIFZuA pkTT7R9g3SICxRJPrv5nBSliFvjGKLHg5ETGLkYODmGBKInpxx1BalgEVCU2THjPDhLmFXCV aD4mALFMTuLy9AdgYzgF3CR27DvFCnGQq8T6WctYIWo2sUt8eF4KMUZA4tvkQywgYyQEZCU2 HWCGKJGUOLjiBssERuEFjAyrGEVTC5ILipPSiwz1ihNzi0vz0vWS83M3MQKD//S/Z707GG8f sD7EKMDBqMTDe2FyYbgQa2JZcWXuIUZToA0TmaVEk/OBMZZXEm9obGZkYWpiamxkbmmmJM6r KPUzWEggPbEkNTs1tSC1KL6oNCe1+BAjEwenVANj+jNtX/578Yp87XL/OtXWtN6JVll7YuHk Wc+YTB5+vffu7tOtc+4WvvLOcFtsqTz34aH7cX/zHt0KiQ7uPKspUVSvsffrhNeP377Z2deR n2Zjt++OlZ3uWcWFTtcmtdkFsUsqHLi9YvaNu8c/7uVouPjqntqiiug9hjuXvlo4V3qZ9suO GKOT55VYijMSDbWYi4oTAWKNPYl5AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrKIsWRmVeSWpSXmKPExsVy+t9jQd0bjwvDDfbPtLDYfuQZq8XiH8+Z LKY+fMJmceNXG6vF6xeGFv2PXzNbbHp8jdXi8q45bBYzzu9jsmj8eJPdgcvj+pJPzB6bVnWy eWxeUu/Rt2UVo8fnTXIBrFENjDYZqYkpqUUKqXnJ+SmZeem2St7B8c7xpmYGhrqGlhbmSgp5 ibmptkouPgG6bpk5QEcpKZQl5pQChQISi4uV9O0wTQgNcdO1gGmM0PUNCYLrMTJAAwlrGDPW X9rDXLBEqOJh+03WBsYvfF2MnBwSAiYSE2YtYoOwxSQu3FsPZHNxCAnMYpSYe+oDlPORUaLx 8wUWkCo2AU2Jpts/wDpEBIolnlz9zwpSxCzwjVFiwcmJjF2MHBzCAlES0487gtSwCKhKbJjw nh0kzCvgKtF8TABimZzE5ekPwMZwCrhJ7Nh3ihXEFgIqWT9rGesERt4FjAyrGCVSC5ILipPS c43yUsv1ihNzi0vz0vWS83M3MYKj7Jn0DsbDu9wPMQpwMCrx8F6YXBguxJpYVlyZe4hRgoNZ SYQ36xFQiDclsbIqtSg/vqg0J7X4EKMp0F0TmaVEk/OBCSCvJN7Q2MTMyNLI3NDCyNhcSZz3 8f91YUIC6YklqdmpqQWpRTB9TBycUg2MK9jfdlg8Z3N+qHTbK89F9rVw/Lnsgwb/ju9n9FH0 YZ5wdXWbwF5nrUmfWHY+ung5rT1MlmXfurw29TdJ57n3mjw/aXX3/Ux3vpOagTY/5Vr/1rC9 Tc5/dlJL3/yQm6XRw9htzbMFeuZ/LTOKNRTKCHskIC5zxWevbbXTv/fW1k1nd+exT49QYinO SDTUYi4qTgQAdZiAisgCAAA= 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 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 --- 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 c65a9e6..6d8486f 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