Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 449bdc2d authored by Linus Walleij's avatar Linus Walleij Committed by Chris Ball
Browse files

mmc: tmio_mmc: use dmaengine helpers, drop submit check 



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: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 3383433c

drivers/mmc/host/tmio_mmc.c

+4 −13
Original line number Diff line number Diff line
@@ -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)