diff options
| author |   Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2020-05-07 14:54:49 +0300 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2020-05-07 13:43:00 +0100 |
| commit | a041e672cb57201d152bfc314e52d41e7643375d (patch) | |
| tree | 7d1bf6b1c1c1415442ff3fd6cdaf43267e4c28e9 /drivers/spi/spi-dw-mid.c | |
| parent | spi: dw: Avoid useless assignments in generic DMA setup (diff) | |
| download | wireguard-linux-a041e672cb57201d152bfc314e52d41e7643375d.tar.xz wireguard-linux-a041e672cb57201d152bfc314e52d41e7643375d.zip | |
spi: dw: Get rid of dma_inited flag
This flag is superfluous in all cases where it's being used, i.e.
* ->can_dma() won't be called without dma_inited == 1
* DMA ->exit() callback can rely on txchan and rxchan variables
So, get rid of dma_inited flag.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20200507115449.8093-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-dw-mid.c')
| -rw-r--r-- | drivers/spi/spi-dw-mid.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/spi/spi-dw-mid.c b/drivers/spi/spi-dw-mid.c index 8b7b94c5a9cc..177e1f5ec62b 100644 --- a/drivers/spi/spi-dw-mid.c +++ b/drivers/spi/spi-dw-mid.c @@ -57,20 +57,21 @@ static int mid_spi_dma_init_mfld(struct device *dev, struct dw_spi *dws) dws->rxchan = dma_request_channel(mask, mid_spi_dma_chan_filter, rx); if (!dws->rxchan) goto err_exit; - dws->master->dma_rx = dws->rxchan; /* 2. Init tx channel */ tx->dma_dev = &dma_dev->dev; dws->txchan = dma_request_channel(mask, mid_spi_dma_chan_filter, tx); if (!dws->txchan) goto free_rxchan; + + dws->master->dma_rx = dws->rxchan; dws->master->dma_tx = dws->txchan; - dws->dma_inited = 1; return 0; free_rxchan: dma_release_channel(dws->rxchan); + dws->rxchan = NULL; err_exit: return -EBUSY; } @@ -80,29 +81,31 @@ static int mid_spi_dma_init_generic(struct device *dev, struct dw_spi *dws) dws->rxchan = dma_request_slave_channel(dev, "rx"); if (!dws->rxchan) return -ENODEV; - dws->master->dma_rx = dws->rxchan; dws->txchan = dma_request_slave_channel(dev, "tx"); if (!dws->txchan) { dma_release_channel(dws->rxchan); + dws->rxchan = NULL; return -ENODEV; } + + dws->master->dma_rx = dws->rxchan; dws->master->dma_tx = dws->txchan; - dws->dma_inited = 1; return 0; } static void mid_spi_dma_exit(struct dw_spi *dws) { - if (!dws->dma_inited) - return; - - dmaengine_terminate_sync(dws->txchan); - dma_release_channel(dws->txchan); + if (dws->txchan) { + dmaengine_terminate_sync(dws->txchan); + dma_release_channel(dws->txchan); + } - dmaengine_terminate_sync(dws->rxchan); - dma_release_channel(dws->rxchan); + if (dws->rxchan) { + dmaengine_terminate_sync(dws->rxchan); + dma_release_channel(dws->rxchan); + } } static irqreturn_t dma_transfer(struct dw_spi *dws) @@ -126,9 +129,6 @@ static bool mid_spi_can_dma(struct spi_controller *master, { struct dw_spi *dws = spi_controller_get_devdata(master); - if (!dws->dma_inited) - return false; - return xfer->len > dws->fifo_len; } |