From: Anton Bondarenko <anton.bondarenko.sama@gmail.com>
To: broonie@kernel.org, b38343@freescale.com, s.hauer@pengutronix.de
Cc: jiada_wang@mentor.com, vladimir_zapolskiy@mentor.com,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org
Subject: [PATCH v4 6/7] spi: imx: return error from dma channel request
Date: Sat, 28 Nov 2015 00:16:04 +0100 [thread overview]
Message-ID: <1448666165-7473-7-git-send-email-anton.bondarenko.sama@gmail.com> (raw)
In-Reply-To: <1448666165-7473-1-git-send-email-anton.bondarenko.sama@gmail.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.sama@gmail.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 f556eaa..aaa32c2 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.3
next prev parent reply other threads:[~2015-11-27 23:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-27 23:15 [PATCH v4 0/7] Improvements for SPI IMX driver for Freescale IMX51, IMX53 and IMX6 Anton Bondarenko
[not found] ` <1448666165-7473-1-git-send-email-anton.bondarenko.sama-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-11-27 23:15 ` [PATCH v4 1/7] spi: imx: Fix DMA transfer Anton Bondarenko
2015-11-30 8:29 ` Sascha Hauer
[not found] ` <20151130082939.GU11966-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2015-11-30 23:35 ` Anton Bondarenko
2015-11-27 23:16 ` [PATCH v4 2/7] spi: imx: replace fixed timeout with calculated one Anton Bondarenko
2015-11-27 23:16 ` [PATCH v4 3/7] spi: imx: add support for all SPI word width for DMA transfer Anton Bondarenko
2015-11-27 23:16 ` [PATCH v4 4/7] spi: imx: add function to check for IMX51 family controller Anton Bondarenko
2015-11-27 23:16 ` [PATCH v4 5/7] spi: imx: Add support for loopback for ECSPI controllers Anton Bondarenko
2015-11-27 23:16 ` Anton Bondarenko [this message]
2015-11-27 23:16 ` [PATCH v4 7/7] spi: imx: defer spi initialization, if DMA engine is pending 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=1448666165-7473-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).