From: Anton Bondarenko <anton.bondarenko.sama@gmail.com>
To: broonie@kernel.org, b38343@freescale.com
Cc: linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
vladimir_zapolskiy@mentor.com, jiada_wang@mentor.com,
s.hauer@pengutronix.de
Subject: [PATCH v3 6/7] spi: imx: return error from dma channel request
Date: Sun, 1 Nov 2015 15:41:40 +0100 [thread overview]
Message-ID: <1446388901-6073-7-git-send-email-anton.bondarenko.sama@gmail.com> (raw)
In-Reply-To: <1446388901-6073-1-git-send-email-anton.bondarenko.sama@gmail.com>
From: Anton Bondarenko <anton_bondarenko@mentor.com>
On SDMA initialization return exactly the same error, which is
reported by dma_request_slave_channel_reason(), it is a preceding
change to defer SPI DMA initialization, if SDMA module is not yet
available.
Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Signed-off-by: Anton Bondarenko <anton_bondarenko@mentor.com>
---
drivers/spi/spi-imx.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index dc492e2..6035ddd 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -923,18 +923,20 @@ static int spi_imx_sdma_init(struct device *dev, struct spi_imx_data *spi_imx,
spi_imx->wml = spi_imx_get_fifosize(spi_imx) / 2;
/* Prepare for TX DMA: */
- master->dma_tx = dma_request_slave_channel(dev, "tx");
- if (!master->dma_tx) {
- dev_err(dev, "cannot get the TX DMA channel!\n");
- ret = -EINVAL;
+ master->dma_tx = dma_request_slave_channel_reason(dev, "tx");
+ if (IS_ERR(master->dma_tx)) {
+ dev_info(dev, "cannot get the TX DMA channel!\n");
+ ret = PTR_ERR(master->dma_tx);
+ master->dma_tx = NULL;
goto err;
}
/* Prepare for RX : */
- master->dma_rx = dma_request_slave_channel(dev, "rx");
- if (!master->dma_rx) {
- dev_dbg(dev, "cannot get the DMA channel.\n");
- ret = -EINVAL;
+ master->dma_rx = dma_request_slave_channel_reason(dev, "rx");
+ if (IS_ERR(master->dma_rx)) {
+ dev_info(dev, "cannot get the DMA channel.\n");
+ ret = PTR_ERR(master->dma_rx);
+ master->dma_rx = NULL;
goto err;
}
--
2.6.2
next prev parent reply other threads:[~2015-11-01 14:42 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-01 14:41 [PATCH v3 0/7] Improvements for SPI IMX driver for Freescale IMX51, IMX53 and IMX6 Anton Bondarenko
2015-11-01 14:41 ` [PATCH v3 1/7] spi: imx: Fix DMA transfer Anton Bondarenko
2015-11-03 7:08 ` Robin Gong
2015-11-04 21:03 ` Anton Bondarenko
2015-11-05 8:34 ` Sascha Hauer
2015-11-05 16:51 ` Anton Bondarenko
2015-11-14 10:02 ` Anton Bondarenko
2015-11-01 14:41 ` [PATCH v3 2/7] spi: imx: replace fixed timeout with calculated one Anton Bondarenko
2015-11-05 8:47 ` Sascha Hauer
2015-11-10 20:20 ` Anton Bondarenko
2015-11-11 8:12 ` Sascha Hauer
2015-11-14 10:01 ` Anton Bondarenko
2015-11-01 14:41 ` [PATCH v3 3/7] spi: imx: add support for all SPI word width for DMA transfer Anton Bondarenko
2015-11-14 10:08 ` Anton Bondarenko
2015-11-01 14:41 ` [PATCH v3 4/7] spi: imx: add function to check for IMX51 family controller Anton Bondarenko
2015-11-14 10:06 ` Anton Bondarenko
2015-11-01 14:41 ` [PATCH v3 5/7] spi: imx: Add support for loopback for ECSPI controllers Anton Bondarenko
2015-11-14 10:06 ` Anton Bondarenko
2015-11-01 14:41 ` Anton Bondarenko [this message]
2015-11-05 8:56 ` [PATCH v3 6/7] spi: imx: return error from dma channel request Sascha Hauer
2015-11-05 16:00 ` Anton Bondarenko
2015-11-14 10:03 ` Anton Bondarenko
2015-11-14 10:05 ` Anton Bondarenko
2015-11-01 14:41 ` [PATCH v3 7/7] spi: imx: defer spi initialization, if DMA engine is pending Anton Bondarenko
2015-11-05 8:59 ` Sascha Hauer
2015-11-05 16:18 ` Anton Bondarenko
2015-11-14 10:03 ` Anton Bondarenko
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=1446388901-6073-7-git-send-email-anton.bondarenko.sama@gmail.com \
--to=anton.bondarenko.sama@gmail.com \
--cc=b38343@freescale.com \
--cc=broonie@kernel.org \
--cc=jiada_wang@mentor.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=vladimir_zapolskiy@mentor.com \
/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).