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

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

mmc: tmio: move finish_request function further down 



Plain code move with no changes. Needed for refactoring. Also, looks
nicer if request and finish_request are next to each other.

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 c5927424

drivers/mmc/host/tmio_mmc_core.c

+38 −38
Original line number Diff line number Diff line
@@ -315,44 +315,6 @@ static void tmio_mmc_reset_work(struct work_struct *work) 
	mmc_request_done(host->mmc, mrq);

}



static void tmio_mmc_finish_request(struct tmio_mmc_host *host)

{

	struct mmc_request *mrq;

	unsigned long flags;



	spin_lock_irqsave(&host->lock, flags);



	mrq = host->mrq;

	if (IS_ERR_OR_NULL(mrq)) {

		spin_unlock_irqrestore(&host->lock, flags);

		return;

	}



	host->cmd = NULL;

	host->data = NULL;

	host->force_pio = false;



	cancel_delayed_work(&host->delayed_reset_work);



	host->mrq = NULL;

	spin_unlock_irqrestore(&host->lock, flags);



	if (mrq->cmd->error || (mrq->data && mrq->data->error))

		tmio_mmc_abort_dma(host);



	if (host->check_scc_error)

		host->check_scc_error(host);



	mmc_request_done(host->mmc, mrq);

}



static void tmio_mmc_done_work(struct work_struct *work)

{

	struct tmio_mmc_host *host = container_of(work, struct tmio_mmc_host,

						  done);

	tmio_mmc_finish_request(host);

}



/* These are the bitmasks the tmio chip requires to implement the MMC response

 * types. Note that R1 and R6 are the same in this scheme. */

#define APP_CMD        0x0040
@@ -945,6 +907,44 @@ static void tmio_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq) 
	tmio_process_mrq(host, mrq);

}



static void tmio_mmc_finish_request(struct tmio_mmc_host *host)

{

	struct mmc_request *mrq;

	unsigned long flags;



	spin_lock_irqsave(&host->lock, flags);



	mrq = host->mrq;

	if (IS_ERR_OR_NULL(mrq)) {

		spin_unlock_irqrestore(&host->lock, flags);

		return;

	}



	host->cmd = NULL;

	host->data = NULL;

	host->force_pio = false;



	cancel_delayed_work(&host->delayed_reset_work);



	host->mrq = NULL;

	spin_unlock_irqrestore(&host->lock, flags);



	if (mrq->cmd->error || (mrq->data && mrq->data->error))

		tmio_mmc_abort_dma(host);



	if (host->check_scc_error)

		host->check_scc_error(host);



	mmc_request_done(host->mmc, mrq);

}



static void tmio_mmc_done_work(struct work_struct *work)

{

	struct tmio_mmc_host *host = container_of(work, struct tmio_mmc_host,

						  done);

	tmio_mmc_finish_request(host);

}



static int tmio_mmc_clk_enable(struct tmio_mmc_host *host)

{

	if (!host->clk_enable)