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

Commit 38e40bf5 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci: Simplify use of tuning timer 



The tuning timer is always used if the tuning mode
is 1 and there is a tuning count, irrespective of
whether this is the first call, or any subsequent
call. Consequently the logic to start the timer
can be simplified.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Reviewed-by: default avatarAaron Lu <aaron.lu@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent d519c863

drivers/mmc/host/sdhci.c

+8 −15
Original line number Diff line number Diff line
@@ -1885,10 +1885,14 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) 
	int tuning_loop_counter = MAX_TUNING_LOOP;

	int err = 0;

	unsigned long flags;

	unsigned int tuning_count = 0;



	sdhci_runtime_pm_get(host);

	spin_lock_irqsave(&host->lock, flags);



	if (host->tuning_mode == SDHCI_TUNING_MODE_1)

		tuning_count = host->tuning_count;



	/*

	 * The Host Controller needs tuning only in case of SDR104 mode

	 * and for SDR50 mode when Use Tuning for SDR50 is set in the
@@ -2033,22 +2037,11 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) 
	}



out:

	/*

	 * If this is the very first time we are here, we start the retuning

	 * timer. Since only during the first time, SDHCI_NEEDS_RETUNING

	 * flag won't be set, we check this condition before actually starting

	 * the timer.

	 */

	if (!(host->flags & SDHCI_NEEDS_RETUNING) && host->tuning_count &&

	    (host->tuning_mode == SDHCI_TUNING_MODE_1)) {

		host->flags |= SDHCI_USING_RETUNING_TIMER;

		mod_timer(&host->tuning_timer, jiffies +

			host->tuning_count * HZ);

	} else if (host->flags & SDHCI_USING_RETUNING_TIMER) {

	host->flags &= ~SDHCI_NEEDS_RETUNING;

		/* Reload the new initial value for timer */

		mod_timer(&host->tuning_timer, jiffies +

			  host->tuning_count * HZ);



	if (tuning_count) {

		host->flags |= SDHCI_USING_RETUNING_TIMER;

		mod_timer(&host->tuning_timer, jiffies + tuning_count * HZ);

	}



	/*