summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/core/core.c
diff options
context:
space:
mode:
authorUlf Hansson2014-01-08 15:06:08 +0100
committerChris Ball2014-02-23 16:40:26 +0100
commit1d4d77444bf4212c44585146a2b353ca24c815f9 (patch)
treeeae3b360e9dc5de2332681a6d3b5b1f25aaee1b7 /drivers/mmc/core/core.c
parentmmc: core: Rename max_discard_to to max_busy_timeout (diff)
downloadkernel-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/core/core.c')
-rw-r--r--drivers/mmc/core/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index d9c1efa2ce15..1935812e4215 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1933,7 +1933,7 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from,
cmd.opcode = MMC_ERASE;
cmd.arg = arg;
cmd.flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC;
- cmd.cmd_timeout_ms = mmc_erase_timeout(card, arg, qty);
+ cmd.busy_timeout = mmc_erase_timeout(card, arg, qty);
err = mmc_wait_for_cmd(card->host, &cmd, 0);
if (err) {
pr_err("mmc_erase: erase error %d, status %#x\n",