From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Ferre Subject: Re: [PATCH 3/3] mci: at91: convert to dma_request_slave_channel_compat() Date: Tue, 16 Apr 2013 12:06:25 +0200 Message-ID: <516D22A1.6010508@atmel.com> References: <1366028217-5037-1-git-send-email-ludovic.desroches@atmel.com> <1366028217-5037-4-git-send-email-ludovic.desroches@atmel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1366028217-5037-4-git-send-email-ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> Sender: linux-i2c-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-mmc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org List-Id: linux-i2c@vger.kernel.org On 04/15/2013 02:16 PM, ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org : > From: Ludovic Desroches > > Use generic DMA DT helper. Platforms booting with or without DT populated are > both supported. > > Signed-off-by: Ludovic Desroches Acked-by: Nicolas Ferre > --- > drivers/mmc/host/atmel-mci.c | 25 ++++++++++++------------- > 1 file changed, 12 insertions(+), 13 deletions(-) > > diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c > index 10f8b73..73d5d24 100644 > --- a/drivers/mmc/host/atmel-mci.c > +++ b/drivers/mmc/host/atmel-mci.c > @@ -2224,10 +2224,15 @@ static void __exit atmci_cleanup_slot(struct atmel_mci_slot *slot, > mmc_free_host(slot->mmc); > } > > -static bool atmci_filter(struct dma_chan *chan, void *slave) > +static bool atmci_filter(struct dma_chan *chan, void *pdata) > { > - struct mci_dma_data *sl = slave; > + 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; > @@ -2239,24 +2244,18 @@ static bool atmci_filter(struct dma_chan *chan, void *slave) > static bool atmci_configure_dma(struct atmel_mci *host) > { > struct mci_platform_data *pdata; > + dma_cap_mask_t mask; > > if (host == NULL) > return false; > > pdata = host->pdev->dev.platform_data; > > - if (!pdata) > - return false; > + dma_cap_zero(mask); > + dma_cap_set(DMA_SLAVE, mask); > > - if (pdata->dma_slave && find_slave_dev(pdata->dma_slave)) { > - dma_cap_mask_t mask; > - > - /* Try to grab a DMA channel */ > - dma_cap_zero(mask); > - dma_cap_set(DMA_SLAVE, mask); > - host->dma.chan = > - dma_request_channel(mask, atmci_filter, pdata->dma_slave); > - } > + host->dma.chan = dma_request_slave_channel_compat(mask, atmci_filter, pdata, > + &host->pdev->dev, "rxtx"); > if (!host->dma.chan) { > dev_warn(&host->pdev->dev, "no DMA channel available\n"); > return false; > -- Nicolas Ferre