| Message ID | 1366028217-5037-4-git-send-email-ludovic.desroches@atmel.com |
|---|---|
| State | Not Applicable |
| Headers | show |
On 04/15/2013 02:16 PM, ludovic.desroches@atmel.com : > From: Ludovic Desroches <ludovic.desroches@atmel.com> > > Use generic DMA DT helper. Platforms booting with or without DT populated are > both supported. > > Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > --- > 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; >
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;