Subject: [RESEND PATCH 1/2] mmc: atmel-mci: remove compat for non DT board when requesting dma chan

From: [email-masked] (Nicolas Ferre)
Date: Fri, 14 Nov 2014 15:46:23 +0100

On 14/11/2014 15:36, Ludovic Desroches :
> 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 <[email-masked]>

Yes, sure.

Acked-by: Nicolas Ferre <[email-masked]>

> ---
> 
> Sorry for the noise, typo in cc list.
> 
>  drivers/mmc/host/atmel-mci.c | 20 +-------------------
>  1 file changed, 1 insertion(+), 19 deletions(-)
> 
> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
> index a7b59ba..de2287c 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;
> 

-- 
Nicolas Ferre