mmc: sdhci: Get rid of host->busy_handle
Now that there is host->data_cmd to record the command for which a data
interrupt is expected, it is possible to determine whether a command with
busy signaling has completed without an extra flag. So host->busy_handle
is not needed. Remove it.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index c9456bd..1f2c4a7 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1014,7 +1014,6 @@
mod_timer(&host->timer, timeout);
host->cmd = cmd;
- host->busy_handle = 0;
if (cmd->data || cmd->flags & MMC_RSP_BUSY) {
WARN_ON(host->data_cmd);
host->data_cmd = cmd;
@@ -1094,9 +1093,8 @@
if (cmd->data) {
DBG("Cannot wait for busy signal when also doing a data transfer");
} else if (!(host->quirks & SDHCI_QUIRK_NO_BUSY_IRQ) &&
- !host->busy_handle) {
- /* Mark that command complete before busy is ended */
- host->busy_handle = 1;
+ cmd == host->data_cmd) {
+ /* Command complete before busy is ended */
return;
}
}
@@ -2393,10 +2391,10 @@
* before the command completed, so make
* sure we do things in the proper order.
*/
- if (host->busy_handle)
- tasklet_schedule(&host->finish_tasklet);
- else
- host->busy_handle = 1;
+ if (host->cmd == data_cmd)
+ return;
+
+ tasklet_schedule(&host->finish_tasklet);
return;
}
}