]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
mmc: tmio_mmc: use dmaengine helpers, drop submit check
authorLinus Walleij <linus.walleij@linaro.org>
Thu, 10 Feb 2011 15:11:07 +0000 (16:11 +0100)
committerChris Ball <cjb@laptop.org>
Tue, 15 Mar 2011 17:49:25 +0000 (13:49 -0400)
Use the new dmaengine helper functions, and drop the error check
on the returned cookier from the dmaengine - we recently
established that this is really not allowed to fail.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/tmio_mmc.c

index 699b6ab209b24c0f3b1d6e6626ca78ee67487477..0e4998fa6fc5fec8369901cdc533f77d6da60657 100644 (file)
@@ -836,13 +836,8 @@ static void tmio_mmc_start_dma_rx(struct tmio_mmc_host *host)
        if (desc) {
                desc->callback = tmio_dma_complete;
                desc->callback_param = host;
-               cookie = desc->tx_submit(desc);
-               if (cookie < 0) {
-                       desc = NULL;
-                       ret = cookie;
-               } else {
-                       chan->device->device_issue_pending(chan);
-               }
+               cookie = dmaengine_submit(desc);
+               dma_async_issue_pending(chan);
        }
        dev_dbg(&host->pdev->dev, "%s(): mapped %d -> %d, cookie %d, rq %p\n",
                __func__, host->sg_len, ret, cookie, host->mrq);
@@ -915,11 +910,7 @@ static void tmio_mmc_start_dma_tx(struct tmio_mmc_host *host)
        if (desc) {
                desc->callback = tmio_dma_complete;
                desc->callback_param = host;
-               cookie = desc->tx_submit(desc);
-               if (cookie < 0) {
-                       desc = NULL;
-                       ret = cookie;
-               }
+               cookie = dmaengine_submit(desc);
        }
        dev_dbg(&host->pdev->dev, "%s(): mapped %d -> %d, cookie %d, rq %p\n",
                __func__, host->sg_len, ret, cookie, host->mrq);
@@ -963,7 +954,7 @@ static void tmio_issue_tasklet_fn(unsigned long priv)
        struct tmio_mmc_host *host = (struct tmio_mmc_host *)priv;
        struct dma_chan *chan = host->chan_tx;
 
-       chan->device->device_issue_pending(chan);
+       dma_async_issue_pending(chan);
 }
 
 static void tmio_tasklet_fn(unsigned long arg)