[PATCH v4 6/7] spi: imx: return error from dma channel request

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Anton Bondarenko <anton.bondarenko.sama@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH v4 6/7] spi: imx: return error from dma channel request
Date	Sat, 28 Nov 2015 00:20:02 +0100
Message-ID	<qzAt4-MY-21@gated-at.bofh.it> (permalink)
References	<qzAt4-MY-3@gated-at.bofh.it>
X-Original-To	broonie@kernel.org, b38343@freescale.com, s.hauer@pengutronix.de
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/6DxE3mgT4ci+ckzg6On2q+xPNPbb1FJz+pVjEXwPcU=; b=bH4hoQk/0ksVaQqSUqidUqzkQ3Ezk6L68pkuWXaYTJ3QoWFEogvHzB71RuiWXG+1Se f6jGTqOdwzqJReT4ZHETnE1BUoHjJBiI4HNwCEjKB+XX8oCMjNi5PtjYRZKUeDTmc2pv QSAnEsMwscRKz/13p7rkx/iS86My8a1lwjM8KSCp4lVSAMkaRU828+kfQKojgx/TphJe o7qIWmbBu+8Pk29RNUkYcE50rfZtKXwzy3DBx1KHuVrXe+J6lDp1KqOQ9MxA2SRHzKyR kPvfTe/2KZPlT1z7s9zI6KK2GViumwiPcUTNc//W9SP84yKms/J4eXcrQS+QFxOomc50 iiMw==
X-Received	by 10.112.129.233 with SMTP id nz9mr2122270lbb.112.1448666175313; Fri, 27 Nov 2015 15:16:15 -0800 (PST)
X-Mailer	git-send-email 2.6.3
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	52
Organization	linux.* mail to news gateway
X-Original-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
X-Original-Date	Sat, 28 Nov 2015 00:16:04 +0100
X-Original-Message-ID	<1448666165-7473-7-git-send-email-anton.bondarenko.sama@gmail.com>
X-Original-References	<1448666165-7473-1-git-send-email-anton.bondarenko.sama@gmail.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1279039

Show key headers only | View raw

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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Thread

[PATCH v4 0/7]  Improvements for SPI IMX driver for Freescale IMX51, IMX53 and IMX6 Anton Bondarenko <anton.bondarenko.sama@gmail.com> - 2015-11-28 00:20 +0100
  [PATCH v4 3/7] spi: imx: add support for all SPI word width for DMA transfer Anton Bondarenko <anton.bondarenko.sama@gmail.com> - 2015-11-28 00:20 +0100
  [PATCH v4 1/7] spi: imx: Fix DMA transfer Anton Bondarenko <anton.bondarenko.sama@gmail.com> - 2015-11-28 00:20 +0100
    Re: [PATCH v4 1/7] spi: imx: Fix DMA transfer Sascha Hauer <s.hauer@pengutronix.de> - 2015-11-30 09:30 +0100
  [PATCH v4 7/7] spi: imx: defer spi initialization, if DMA engine is pending Anton Bondarenko <anton.bondarenko.sama@gmail.com> - 2015-11-28 00:20 +0100
  [PATCH v4 2/7] spi: imx: replace fixed timeout with calculated one Anton Bondarenko <anton.bondarenko.sama@gmail.com> - 2015-11-28 00:20 +0100
  [PATCH v4 6/7] spi: imx: return error from dma channel request Anton Bondarenko <anton.bondarenko.sama@gmail.com> - 2015-11-28 00:20 +0100
  [PATCH v4 5/7] spi: imx: Add support for loopback for ECSPI controllers Anton Bondarenko <anton.bondarenko.sama@gmail.com> - 2015-11-28 00:20 +0100

csiph-web