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

Commit de2a6bb9 authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: tmio: refactor handling mrq 



Split handling mrq into a seperate function. We need to call it from
another place soon.

Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 10c998ef

drivers/mmc/host/tmio_mmc_core.c

+26 −20
Original line number Diff line number Diff line
@@ -894,12 +894,36 @@ static int tmio_mmc_execute_tuning(struct mmc_host *mmc, u32 opcode) 
	return ret;

}



static void tmio_process_mrq(struct tmio_mmc_host *host, struct mmc_request *mrq)

{

	int ret;



	if (mrq->data) {

		ret = tmio_mmc_start_data(host, mrq->data);

		if (ret)

			goto fail;

	}



	ret = tmio_mmc_start_command(host, mrq->cmd);

	if (ret)

		goto fail;



	schedule_delayed_work(&host->delayed_reset_work,

			      msecs_to_jiffies(CMDREQ_TIMEOUT));

	return;



fail:

	host->force_pio = false;

	host->mrq = NULL;

	mrq->cmd->error = ret;

	mmc_request_done(host->mmc, mrq);

}



/* Process requests from the MMC layer */

static void tmio_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)

{

	struct tmio_mmc_host *host = mmc_priv(mmc);

	unsigned long flags;

	int ret;



	spin_lock_irqsave(&host->lock, flags);
@@ -919,25 +943,7 @@ static void tmio_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq) 


	spin_unlock_irqrestore(&host->lock, flags);



	if (mrq->data) {

		ret = tmio_mmc_start_data(host, mrq->data);

		if (ret)

			goto fail;

	}



	ret = tmio_mmc_start_command(host, mrq->cmd);

	if (ret)

		goto fail;



	schedule_delayed_work(&host->delayed_reset_work,

			      msecs_to_jiffies(CMDREQ_TIMEOUT));

	return;



fail:

	host->force_pio = false;

	host->mrq = NULL;

	mrq->cmd->error = ret;

	mmc_request_done(mmc, mrq);

	tmio_process_mrq(host, mrq);

}



static int tmio_mmc_clk_enable(struct tmio_mmc_host *host)