diff options
| author | Ludovic Desroches <ludovic.desroches@atmel.com> | 2014-11-14 19:12:53 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-24 21:57:37 +0300 |
| commit | 7758e390699fb25bf91642d52734200db38e764b (patch) | |
| tree | 06b90da9a3d4383792110abaf42a48dbb1de7b2e /drivers/spi/spi-atmel.c | |
| parent | c1ee8f3fdff2b5763fe13be0a50a7ab3df015f5b (diff) | |
| download | linux-7758e390699fb25bf91642d52734200db38e764b.tar.xz | |
spi: atmel: remove compat for non DT board when requesting dma chan
All boards with a dma controller have DT support so using
dma_request_slave_channel_compat is no more needed.
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-atmel.c')
| -rw-r--r-- | drivers/spi/spi-atmel.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index 6ed18934dffe..3370a3dfd883 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -417,23 +417,6 @@ static int atmel_spi_dma_slave_config(struct atmel_spi *as, return err; } -static bool filter(struct dma_chan *chan, void *pdata) -{ - struct atmel_spi_dma *sl_pdata = pdata; - struct at_dma_slave *sl; - - if (!sl_pdata) - return false; - - sl = &sl_pdata->dma_slave; - if (sl->dma_dev == chan->device->dev) { - chan->private = sl; - return true; - } else { - return false; - } -} - static int atmel_spi_configure_dma(struct atmel_spi *as) { struct dma_slave_config slave_config; @@ -444,9 +427,7 @@ static int atmel_spi_configure_dma(struct atmel_spi *as) dma_cap_zero(mask); dma_cap_set(DMA_SLAVE, mask); - as->dma.chan_tx = dma_request_slave_channel_compat(mask, filter, - &as->dma, - dev, "tx"); + as->dma.chan_tx = dma_request_slave_channel(dev, "tx"); if (!as->dma.chan_tx) { dev_err(dev, "DMA TX channel not available, SPI unable to use DMA\n"); @@ -454,9 +435,7 @@ static int atmel_spi_configure_dma(struct atmel_spi *as) goto error; } - as->dma.chan_rx = dma_request_slave_channel_compat(mask, filter, - &as->dma, - dev, "rx"); + as->dma.chan_rx = dma_request_slave_channel(dev, "rx"); if (!as->dma.chan_rx) { dev_err(dev, |