Commit 2e72ab9b authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci: Reorganize sdhci_finish_mrq() and __sdhci_finish_mrq() 



In preparation for removing finish_tasklet, reorganize sdhci_finish_mrq()
and __sdhci_finish_mrq() to separate the tasklet scheduling from other
processing.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Reviewed-by: default avatarFaiz Abbas <faiz_abbas@ti.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent ade024f1

drivers/mmc/host/sdhci.c

+14 −14
Original line number Diff line number Diff line
@@ -1221,6 +1221,18 @@ static void __sdhci_finish_mrq(struct sdhci_host *host, struct mmc_request *mrq) 
{

	int i;



	if (host->cmd && host->cmd->mrq == mrq)

		host->cmd = NULL;



	if (host->data_cmd && host->data_cmd->mrq == mrq)

		host->data_cmd = NULL;



	if (host->data && host->data->mrq == mrq)

		host->data = NULL;



	if (sdhci_needs_reset(host, mrq))

		host->pending_reset = true;



	for (i = 0; i < SDHCI_MAX_MRQS; i++) {

		if (host->mrqs_done[i] == mrq) {

			WARN_ON(1);
@@ -1236,25 +1248,13 @@ static void __sdhci_finish_mrq(struct sdhci_host *host, struct mmc_request *mrq) 
	}



	WARN_ON(i >= SDHCI_MAX_MRQS);



	tasklet_schedule(&host->finish_tasklet);

}



static void sdhci_finish_mrq(struct sdhci_host *host, struct mmc_request *mrq)

{

	if (host->cmd && host->cmd->mrq == mrq)

		host->cmd = NULL;



	if (host->data_cmd && host->data_cmd->mrq == mrq)

		host->data_cmd = NULL;



	if (host->data && host->data->mrq == mrq)

		host->data = NULL;



	if (sdhci_needs_reset(host, mrq))

		host->pending_reset = true;



	__sdhci_finish_mrq(host, mrq);



	tasklet_schedule(&host->finish_tasklet);

}



static void sdhci_finish_data(struct sdhci_host *host)