From: Andi Shyti <andi.shyti@samsung.com>
To: Mark Brown <broonie@kernel.org>
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>,
linux-kernel@vger.kernel.org, Andi Shyti <andi.shyti@samsung.com>,
linux-spi@vger.kernel.org, Kukjin Kim <kgene@kernel.org>,
Andi Shyti <andi@etezian.org>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 5/5] spi: s3c63xx: simplify if statement in prepare_transfer function
Date: Fri, 17 Jun 2016 16:57:25 +0900 [thread overview]
Message-ID: <1466150245-2648-6-git-send-email-andi.shyti@samsung.com> (raw)
In-Reply-To: <1466150245-2648-1-git-send-email-andi.shyti@samsung.com>
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 <andi.shyti@samsung.com>
---
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
next prev parent reply other threads:[~2016-06-17 7:57 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-17 7:57 [PATCH 0/5] SPI CS line logical change and s3c64xx code rework Andi Shyti
[not found] ` <1466150245-2648-1-git-send-email-andi.shyti-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2016-06-17 7:57 ` [PATCH 1/5] spi: do not fail if the CS line is not connected Andi Shyti
[not found] ` <1466150245-2648-2-git-send-email-andi.shyti-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2016-06-17 10:47 ` Mark Brown
2016-06-17 11:36 ` Andi Shyti
[not found] ` <20160617113622.GA10760-A05emIGRluN/OPZsa/fw/Q@public.gmane.org>
2016-06-17 12:28 ` Mark Brown
[not found] ` <20160617122803.GN26099-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2016-06-19 6:09 ` Andi Shyti
[not found] ` <20160619060902.GB424-A05emIGRluN/OPZsa/fw/Q@public.gmane.org>
2016-06-26 12:48 ` Mark Brown
[not found] ` <20160626124843.GP28202-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2016-06-27 10:57 ` Andi Shyti
2016-06-27 13:06 ` Mark Brown
[not found] ` <20160627130657.GV28202-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2016-06-27 14:08 ` Andi Shyti
2016-06-17 7:57 ` [PATCH 2/5] spi: s3c64xx: group the CS signalling writes in a single function Andi Shyti
2016-06-30 12:15 ` Applied "spi: s3c64xx: group the CS signalling writes in a single function" to the spi tree Mark Brown
2016-06-17 7:57 ` [PATCH 3/5] spi: s3c64xx: consider the case where the CS line is not connected Andi Shyti
2016-06-17 7:57 ` [PATCH 4/5] spi: s3c64xx: do not configure the device twice Andi Shyti
2016-06-30 12:15 ` Applied "spi: s3c64xx: do not configure the device twice" to the spi tree Mark Brown
2016-06-17 7:57 ` Andi Shyti [this message]
2016-06-30 12:15 ` Applied "spi: s3c64xx: simplify if statement in prepare_transfer function" " Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1466150245-2648-6-git-send-email-andi.shyti@samsung.com \
--to=andi.shyti@samsung.com \
--cc=andi@etezian.org \
--cc=broonie@kernel.org \
--cc=k.kozlowski@samsung.com \
--cc=kgene@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).