diff options
| author | ludovic.desroches@atmel.com <ludovic.desroches@atmel.com> | 2014-11-14 17:36:24 +0300 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-11-26 16:31:01 +0300 |
| commit | ecb89f2f5f3e771108a5595b0b4d1a1a974cc926 (patch) | |
| tree | 590b13416d014ac5f03d71d4a9579b7136a211d8 /drivers/mmc | |
| parent | 767562348b72cb2612f5991ad35a5c0448254939 (diff) | |
| download | linux-ecb89f2f5f3e771108a5595b0b4d1a1a974cc926.tar.xz | |
mmc: atmel-mci: 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>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/atmel-mci.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index a7b59ba399a1..de2287c5bf3a 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -2272,23 +2272,6 @@ static void atmci_cleanup_slot(struct atmel_mci_slot *slot, mmc_free_host(slot->mmc); } -static bool atmci_filter(struct dma_chan *chan, void *pdata) -{ - struct mci_platform_data *sl_pdata = pdata; - struct mci_dma_data *sl; - - if (!sl_pdata) - return false; - - sl = sl_pdata->dma_slave; - if (sl && find_slave_dev(sl) == chan->device->dev) { - chan->private = slave_data_ptr(sl); - return true; - } else { - return false; - } -} - static bool atmci_configure_dma(struct atmel_mci *host) { struct mci_platform_data *pdata; @@ -2302,8 +2285,7 @@ static bool atmci_configure_dma(struct atmel_mci *host) dma_cap_zero(mask); dma_cap_set(DMA_SLAVE, mask); - host->dma.chan = dma_request_slave_channel_compat(mask, atmci_filter, pdata, - &host->pdev->dev, "rxtx"); + host->dma.chan = dma_request_slave_channel(&host->pdev->dev, "rxtx"); if (!host->dma.chan) { dev_warn(&host->pdev->dev, "no DMA channel available\n"); return false; |