Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecb89f2f authored by ludovic.desroches@atmel.com's avatar ludovic.desroches@atmel.com Committed by Ulf Hansson
Browse files

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: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 76756234

drivers/mmc/host/atmel-mci.c

+1 −19
Original line number Diff line number Diff line
@@ -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;