]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
spi: atmel: remove compat for non DT board when requesting dma chan
authorLudovic Desroches <ludovic.desroches@atmel.com>
Fri, 14 Nov 2014 16:12:53 +0000 (17:12 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 24 Nov 2014 18:57:37 +0000 (18:57 +0000)
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>
drivers/spi/spi-atmel.c

index 6ed18934dffe24d502c1824ed8ac6012bd769a5f..3370a3dfd883a50b0006afda784fa1ebc7e10f5d 100644 (file)
@@ -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,