diff options
| author | Ulf Hansson | 2014-01-08 15:06:08 +0100 |
|---|---|---|
| committer | Chris Ball | 2014-02-23 16:40:26 +0100 |
| commit | 1d4d77444bf4212c44585146a2b353ca24c815f9 (patch) | |
| tree | eae3b360e9dc5de2332681a6d3b5b1f25aaee1b7 /drivers/mmc/host/sdhci.c | |
| parent | mmc: core: Rename max_discard_to to max_busy_timeout (diff) | |
| download | kernel-qcow2-linux-1d4d77444bf4212c44585146a2b353ca24c815f9.tar.gz kernel-qcow2-linux-1d4d77444bf4212c44585146a2b353ca24c815f9.tar.xz kernel-qcow2-linux-1d4d77444bf4212c44585146a2b353ca24c815f9.zip | |
mmc: core: Rename cmd_timeout_ms to busy_timeout
To better reflect that the cmd_timeout_ms is directly related to the
busy detection timeout, let's rename it.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <chris@printf.net>
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index d1e1bf52fe52..7f95211e9449 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -675,12 +675,12 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd) return 0xE; /* Unspecified timeout, assume max */ - if (!data && !cmd->cmd_timeout_ms) + if (!data && !cmd->busy_timeout) return 0xE; /* timeout in us */ if (!data) - target_timeout = cmd->cmd_timeout_ms * 1000; + target_timeout = cmd->busy_timeout * 1000; else { target_timeout = data->timeout_ns / 1000; if (host->clock) @@ -1019,8 +1019,8 @@ void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd) } timeout = jiffies; - if (!cmd->data && cmd->cmd_timeout_ms > 9000) - timeout += DIV_ROUND_UP(cmd->cmd_timeout_ms, 1000) * HZ + HZ; + if (!cmd->data && cmd->busy_timeout > 9000) + timeout += DIV_ROUND_UP(cmd->busy_timeout, 1000) * HZ + HZ; else timeout += 10 * HZ; mod_timer(&host->timer, timeout); |