From: Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
To: linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Anton Bondarenko
<anton.bondarenko.sama-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
Subject: [PATCH 07/13] spi: imx: drop unncessary dma_is_inited variable
Date: Wed, 17 Feb 2016 14:28:53 +0100 [thread overview]
Message-ID: <1455715739-25161-8-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1455715739-25161-1-git-send-email-s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
There's no need for an extra dma_is_inited variable when we can
equally well check for the existence of a DMA channel.
Signed-off-by: Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
---
drivers/spi/spi-imx.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 073a134..57b7af8 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -102,7 +102,6 @@ struct spi_imx_data {
unsigned int txfifo; /* number of words pushed in tx FIFO */
/* DMA */
- unsigned int dma_is_inited;
unsigned int dma_finished;
bool usedma;
u32 wml;
@@ -205,7 +204,7 @@ static bool spi_imx_can_dma(struct spi_master *master, struct spi_device *spi,
{
struct spi_imx_data *spi_imx = spi_master_get_devdata(master);
- if (spi_imx->dma_is_inited && transfer->len >= spi_imx->wml &&
+ if (master->dma_rx && transfer->len >= spi_imx->wml &&
(transfer->len % spi_imx->wml) == 0)
return true;
return false;
@@ -827,8 +826,6 @@ static void spi_imx_sdma_exit(struct spi_imx_data *spi_imx)
dma_release_channel(master->dma_tx);
master->dma_tx = NULL;
}
-
- spi_imx->dma_is_inited = 0;
}
static int spi_imx_sdma_init(struct device *dev, struct spi_imx_data *spi_imx,
@@ -888,7 +885,6 @@ static int spi_imx_sdma_init(struct device *dev, struct spi_imx_data *spi_imx,
master->max_dma_len = MAX_SDMA_BD_BYTES;
spi_imx->bitbang.master->flags = SPI_MASTER_MUST_RX |
SPI_MASTER_MUST_TX;
- spi_imx->dma_is_inited = 1;
return 0;
err:
--
2.7.0
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-02-17 13:28 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-17 13:28 [PATCH] i.MX SPI DMA cleanup Sascha Hauer
[not found] ` <1455715739-25161-1-git-send-email-s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-02-17 13:28 ` [PATCH 01/13] spi: imx: allow only WML aligned transfers to use DMA Sascha Hauer
[not found] ` <1455715739-25161-2-git-send-email-s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-02-17 14:16 ` Mark Brown
[not found] ` <20160217141619.GR7544-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2016-02-17 15:01 ` Sascha Hauer
[not found] ` <20160217150146.GC3939-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-02-17 16:05 ` Mark Brown
2016-02-17 19:13 ` Applied "spi: imx: allow only WML aligned transfers to use DMA" to the spi tree Mark Brown
2016-02-17 13:28 ` [PATCH 02/13] spi: imx: use proper dev_* functions for driver messages Sascha Hauer
[not found] ` <1455715739-25161-3-git-send-email-s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-02-17 19:13 ` Applied "spi: imx: use proper dev_* functions for driver messages" to the spi tree Mark Brown
2016-02-17 13:28 ` [PATCH 03/13] spi: imx: replace fixed timeout with calculated Sascha Hauer
[not found] ` <1455715739-25161-4-git-send-email-s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-02-17 14:22 ` Mark Brown
2016-02-20 18:11 ` Applied "spi: imx: replace fixed timeout with calculated" to the spi tree Mark Brown
2016-02-17 13:28 ` [PATCH 04/13] spi: imx: drop fallback to PIO Sascha Hauer
2016-02-17 13:28 ` [PATCH 05/13] spi: imx: initialize usedma earlier Sascha Hauer
[not found] ` <1455715739-25161-6-git-send-email-s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-02-26 2:48 ` Applied "spi: imx: initialize usedma earlier" to the spi tree Mark Brown
2016-02-17 13:28 ` [PATCH 06/13] spi: imx: drop unnecessary read/modify/write Sascha Hauer
[not found] ` <1455715739-25161-7-git-send-email-s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-02-26 2:48 ` Applied "spi: imx: drop unnecessary read/modify/write" to the spi tree Mark Brown
2016-02-17 13:28 ` Sascha Hauer [this message]
[not found] ` <1455715739-25161-8-git-send-email-s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-02-26 2:47 ` Applied "spi: imx: drop unncessary dma_is_inited variable" " Mark Brown
2016-02-17 13:28 ` [PATCH 08/13] spi: imx: add support for all SPI word width for DMA Sascha Hauer
[not found] ` <1455715739-25161-9-git-send-email-s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-02-26 2:47 ` Applied "spi: imx: add support for all SPI word width for DMA" to the spi tree Mark Brown
2016-02-17 13:28 ` [PATCH 09/13] spi: imx: remove unnecessary bit clearing in mx51_ecspi_config Sascha Hauer
[not found] ` <1455715739-25161-10-git-send-email-s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-02-26 2:47 ` Applied "spi: imx: remove unnecessary bit clearing in mx51_ecspi_config" to the spi tree Mark Brown
2016-02-17 13:28 ` [PATCH 10/13] spi: imx: make some register defines simpler Sascha Hauer
[not found] ` <1455715739-25161-11-git-send-email-s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-02-26 2:47 ` Applied "spi: imx: make some register defines simpler" to the spi tree Mark Brown
2016-02-17 13:28 ` [PATCH 11/13] spi: imx: set MX51_ECSPI_CTRL_SMC bit in setup function Sascha Hauer
[not found] ` <1455715739-25161-12-git-send-email-s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-02-26 2:47 ` Applied "spi: imx: set MX51_ECSPI_CTRL_SMC bit in setup function" to the spi tree Mark Brown
2016-02-17 13:28 ` [PATCH 12/13] spi: imx: drop bogus tests for rx/tx bufs in DMA transfer Sascha Hauer
2016-02-17 13:28 ` [PATCH 13/13] ARM: dts: imx6: Use correct SDMA script for SPI cores Sascha Hauer
2016-02-17 13:42 ` [PATCH] i.MX SPI DMA cleanup Dirk Behme
[not found] ` <56C478C9.6050706-V5te9oGctAVWk0Htik3J/w@public.gmane.org>
2016-02-17 13:54 ` Sascha Hauer
[not found] ` <20160217135441.GA3939-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-02-17 14:10 ` Dirk Behme
[not found] ` <56C47F64.1080706-V5te9oGctAVWk0Htik3J/w@public.gmane.org>
2016-02-17 14:59 ` Sascha Hauer
[not found] ` <20160217145944.GB3939-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-02-17 15:33 ` Dirk Behme
[not found] ` <56C492DB.6000405-V5te9oGctAVWk0Htik3J/w@public.gmane.org>
2016-02-17 15:40 ` Fabio Estevam
2016-02-18 14:47 ` Shawn Guo
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=1455715739-25161-8-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer-bicnvbalz9megne8c9+irq@public.gmane.org \
--cc=anton.bondarenko.sama-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.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).