mmc: atmel-mci: remove compat for non DT board when requesting dma chan
authorludovic.desroches@atmel.com <ludovic.desroches@atmel.com>
Fri, 14 Nov 2014 14:36:24 +0000 (15:36 +0100)
committerUlf Hansson <ulf.hansson@linaro.org>
Wed, 26 Nov 2014 13:31:01 +0000 (14:31 +0100)
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>
drivers/mmc/host/atmel-mci.c

index a7b59ba399a15947e04dd50941a069e5ac4d2433..de2287c5bf3aaf59a3ab85c7d6a7e49d34dbd719 100644 (file)
@@ -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;