Commit 1d4d7744 authored by Ulf Hansson's avatar Ulf Hansson Committed by Chris Ball
Browse files

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: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <chris@printf.net>
parent 68eb80e0

drivers/mmc/core/core.c

+1 −1
Original line number Diff line number Diff line
@@ -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",

drivers/mmc/core/mmc_ops.c

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, 
		cmd.flags |= MMC_RSP_SPI_R1 | MMC_RSP_R1;





	cmd.cmd_timeout_ms = timeout_ms;

	cmd.busy_timeout = timeout_ms;

	if (index == EXT_CSD_SANITIZE_START)

		cmd.sanitize_busy = true;

drivers/mmc/host/sdhci.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

include/linux/mmc/core.h

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ struct mmc_command { 
 *              actively failing requests

 */



	unsigned int		cmd_timeout_ms;	/* in milliseconds */

	unsigned int		busy_timeout;	/* busy detect timeout in ms */

	/* Set this flag only for blocking sanitize request */

	bool			sanitize_busy;