Commit 0cc563ce authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci: Factor out sdhci_needs_reset() 



Factor out sdhci_needs_reset() so it can be reused.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent a6d3bdd5

drivers/mmc/host/sdhci.c

+11 −7
Original line number Diff line number Diff line
@@ -923,6 +923,16 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host, 
	sdhci_writew(host, mode, SDHCI_TRANSFER_MODE);

}



static bool sdhci_needs_reset(struct sdhci_host *host, struct mmc_request *mrq)

{

	return (!(host->flags & SDHCI_DEVICE_DEAD) &&

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

		 (mrq->sbc && mrq->sbc->error) ||

		 (mrq->data && ((mrq->data->error && !mrq->data->stop) ||

				(mrq->data->stop && mrq->data->stop->error))) ||

		 (host->quirks & SDHCI_QUIRK_RESET_AFTER_REQUEST)));

}



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

{

	tasklet_schedule(&host->finish_tasklet);
@@ -2212,13 +2222,7 @@ static void sdhci_tasklet_finish(unsigned long param) 
	 * The controller needs a reset of internal state machines

	 * upon error conditions.

	 */

	if (!(host->flags & SDHCI_DEVICE_DEAD) &&

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

	     (mrq->sbc && mrq->sbc->error) ||

	     (mrq->data && ((mrq->data->error && !mrq->data->stop) ||

			    (mrq->data->stop && mrq->data->stop->error))) ||

	     (host->quirks & SDHCI_QUIRK_RESET_AFTER_REQUEST))) {



	if (sdhci_needs_reset(host, mrq)) {

		/* Some controllers need this kick or reset won't work here */

		if (host->quirks & SDHCI_QUIRK_CLOCK_BEFORE_RESET)

			/* This is to force an update */