iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel

Browse Source 
With the new dma_request_chan() the client driver does not need to look for
the DMA resource and it does not need to pass filter_fn anymore.
By switching to the new API the driver can now support deferred probing
against DMA.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Peter Ujfalusi 2016-04-29 16:06:18 +03:00 committed by Ulf Hansson
parent 4406433dec
commit 81eef6ca92
1 changed files with 10 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/mmc/host/omap_hsmmc.c
View File

@ -32,7 +32,6 @@
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/of_gpio.h> #include <linux/of_gpio.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/omap-dmaengine.h>
#include <linux/mmc/host.h> #include <linux/mmc/host.h>
#include <linux/mmc/core.h> #include <linux/mmc/core.h>
#include <linux/mmc/mmc.h> #include <linux/mmc/mmc.h>
@ -1993,8 +1992,6 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
struct resource *res; struct resource *res;
int ret, irq; int ret, irq;
const struct of_device_id *match; const struct of_device_id *match;
dma_cap_mask_t mask;
unsigned tx_req, rx_req;
const struct omap_mmc_of_data *data; const struct omap_mmc_of_data *data;
void __iomem *base; void __iomem *base;
@ -2124,44 +2121,17 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
omap_hsmmc_conf_bus_power(host); omap_hsmmc_conf_bus_power(host);
if (!pdev->dev.of_node) { host->rx_chan = dma_request_chan(&pdev->dev, "rx");
res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "tx"); if (IS_ERR(host->rx_chan)) {
if (!res) { dev_err(mmc_dev(host->mmc), "RX DMA channel request failed\n");
dev_err(mmc_dev(host->mmc), "cannot get DMA TX channel\n"); ret = PTR_ERR(host->rx_chan);
ret = -ENXIO;
goto err_irq;
}
tx_req = res->start;
res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "rx");
if (!res) {
dev_err(mmc_dev(host->mmc), "cannot get DMA RX channel\n");
ret = -ENXIO;
goto err_irq;
}
rx_req = res->start;
}
dma_cap_zero(mask);
dma_cap_set(DMA_SLAVE, mask);
host->rx_chan =
dma_request_slave_channel_compat(mask, omap_dma_filter_fn,
&rx_req, &pdev->dev, "rx");
if (!host->rx_chan) {
dev_err(mmc_dev(host->mmc), "unable to obtain RX DMA engine channel\n");
ret = -ENXIO;
goto err_irq; goto err_irq;
} }
host->tx_chan = host->tx_chan = dma_request_chan(&pdev->dev, "tx");
dma_request_slave_channel_compat(mask, omap_dma_filter_fn, if (IS_ERR(host->tx_chan)) {
&tx_req, &pdev->dev, "tx"); dev_err(mmc_dev(host->mmc), "TX DMA channel request failed\n");
ret = PTR_ERR(host->tx_chan);
if (!host->tx_chan) {
dev_err(mmc_dev(host->mmc), "unable to obtain TX DMA engine channel\n");
ret = -ENXIO;
goto err_irq; goto err_irq;
} }
@ -2219,9 +2189,9 @@ err_slot_name:
mmc_remove_host(mmc); mmc_remove_host(mmc);
err_irq: err_irq:
device_init_wakeup(&pdev->dev, false); device_init_wakeup(&pdev->dev, false);
if (host->tx_chan) if (!IS_ERR_OR_NULL(host->tx_chan))
dma_release_channel(host->tx_chan); dma_release_channel(host->tx_chan);
if (host->rx_chan) if (!IS_ERR_OR_NULL(host->rx_chan))
dma_release_channel(host->rx_chan); dma_release_channel(host->rx_chan);
pm_runtime_dont_use_autosuspend(host->dev); pm_runtime_dont_use_autosuspend(host->dev);
pm_runtime_put_sync(host->dev); pm_runtime_put_sync(host->dev);