diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-02-24 03:20:28 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-02-25 21:04:14 -0500 |
commit | 882f329f31cb7317811fe084e0b0642954649bf5 (patch) | |
tree | 368b3b8c9d92d01e86b2d6073d4a07d2c8b7b266 | |
parent | 2b0fd069ec159d8234c730855eb892104ae2edc9 (diff) |
spi: imx: drop unncessary dma_is_inited variable
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@pengutronix.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | drivers/spi/spi-imx.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index ec033043734a..567a2426e314 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c | |||
@@ -102,7 +102,6 @@ struct spi_imx_data { | |||
102 | unsigned int txfifo; /* number of words pushed in tx FIFO */ | 102 | unsigned int txfifo; /* number of words pushed in tx FIFO */ |
103 | 103 | ||
104 | /* DMA */ | 104 | /* DMA */ |
105 | unsigned int dma_is_inited; | ||
106 | unsigned int dma_finished; | 105 | unsigned int dma_finished; |
107 | bool usedma; | 106 | bool usedma; |
108 | u32 wml; | 107 | u32 wml; |
@@ -205,7 +204,7 @@ static bool spi_imx_can_dma(struct spi_master *master, struct spi_device *spi, | |||
205 | { | 204 | { |
206 | struct spi_imx_data *spi_imx = spi_master_get_devdata(master); | 205 | struct spi_imx_data *spi_imx = spi_master_get_devdata(master); |
207 | 206 | ||
208 | if (spi_imx->dma_is_inited && transfer->len >= spi_imx->wml && | 207 | if (master->dma_rx && transfer->len >= spi_imx->wml && |
209 | (transfer->len % spi_imx->wml) == 0) | 208 | (transfer->len % spi_imx->wml) == 0) |
210 | return true; | 209 | return true; |
211 | return false; | 210 | return false; |
@@ -827,8 +826,6 @@ static void spi_imx_sdma_exit(struct spi_imx_data *spi_imx) | |||
827 | dma_release_channel(master->dma_tx); | 826 | dma_release_channel(master->dma_tx); |
828 | master->dma_tx = NULL; | 827 | master->dma_tx = NULL; |
829 | } | 828 | } |
830 | |||
831 | spi_imx->dma_is_inited = 0; | ||
832 | } | 829 | } |
833 | 830 | ||
834 | static int spi_imx_sdma_init(struct device *dev, struct spi_imx_data *spi_imx, | 831 | 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, | |||
888 | master->max_dma_len = MAX_SDMA_BD_BYTES; | 885 | master->max_dma_len = MAX_SDMA_BD_BYTES; |
889 | spi_imx->bitbang.master->flags = SPI_MASTER_MUST_RX | | 886 | spi_imx->bitbang.master->flags = SPI_MASTER_MUST_RX | |
890 | SPI_MASTER_MUST_TX; | 887 | SPI_MASTER_MUST_TX; |
891 | spi_imx->dma_is_inited = 1; | ||
892 | 888 | ||
893 | return 0; | 889 | return 0; |
894 | err: | 890 | err: |