AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

mmc: sh_mmcif: use dmaengine helpers, drop submit check

Browse Source 
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>
This commit is contained in:
Linus Walleij 2011-02-10 16:10:00 +01:00 committed by Chris Ball
parent f38f94c6b2
commit a5ece7d29d
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/mmc/host/sh_mmcif.c
View File

@ -224,14 +224,9 @@ static void sh_mmcif_start_dma_rx(struct sh_mmcif_host *host)
if (desc) { if (desc) {
desc->callback = mmcif_dma_complete; desc->callback = mmcif_dma_complete;
desc->callback_param = host; desc->callback_param = host;
cookie = desc->tx_submit(desc); cookie = dmaengine_submit(desc);
if (cookie < 0) { sh_mmcif_bitset(host, MMCIF_CE_BUF_ACC, BUF_ACC_DMAREN);
desc = NULL; dma_async_issue_pending(chan);
ret = cookie;
} else {
sh_mmcif_bitset(host, MMCIF_CE_BUF_ACC, BUF_ACC_DMAREN);
chan->device->device_issue_pending(chan);
}
} }
dev_dbg(&host->pd->dev, "%s(): mapped %d -> %d, cookie %d\n", dev_dbg(&host->pd->dev, "%s(): mapped %d -> %d, cookie %d\n",
__func__, host->data->sg_len, ret, cookie); __func__, host->data->sg_len, ret, cookie);
@ -277,14 +272,9 @@ static void sh_mmcif_start_dma_tx(struct sh_mmcif_host *host)
if (desc) { if (desc) {
desc->callback = mmcif_dma_complete; desc->callback = mmcif_dma_complete;
desc->callback_param = host; desc->callback_param = host;
cookie = desc->tx_submit(desc); cookie = dmaengine_submit(desc);
if (cookie < 0) { sh_mmcif_bitset(host, MMCIF_CE_BUF_ACC, BUF_ACC_DMAWEN);
desc = NULL; dma_async_issue_pending(chan);
ret = cookie;
} else {
sh_mmcif_bitset(host, MMCIF_CE_BUF_ACC, BUF_ACC_DMAWEN);
chan->device->device_issue_pending(chan);
}
} }
dev_dbg(&host->pd->dev, "%s(): mapped %d -> %d, cookie %d\n", dev_dbg(&host->pd->dev, "%s(): mapped %d -> %d, cookie %d\n",
__func__, host->data->sg_len, ret, cookie); __func__, host->data->sg_len, ret, cookie);