diff options
Diffstat (limited to 'drivers/mmc/card/block.c')
| -rw-r--r-- | drivers/mmc/card/block.c | 14 | 
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index dd2d374dcc7..276d21ce6bc 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -554,7 +554,6 @@ static u32 mmc_sd_num_wr_blocks(struct mmc_card *card)  	struct mmc_request mrq = {NULL};  	struct mmc_command cmd = {0};  	struct mmc_data data = {0}; -	unsigned int timeout_us;  	struct scatterlist sg; @@ -574,23 +573,12 @@ static u32 mmc_sd_num_wr_blocks(struct mmc_card *card)  	cmd.arg = 0;  	cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC; -	data.timeout_ns = card->csd.tacc_ns * 100; -	data.timeout_clks = card->csd.tacc_clks * 100; - -	timeout_us = data.timeout_ns / 1000; -	timeout_us += data.timeout_clks * 1000 / -		(card->host->ios.clock / 1000); - -	if (timeout_us > 100000) { -		data.timeout_ns = 100000000; -		data.timeout_clks = 0; -	} -  	data.blksz = 4;  	data.blocks = 1;  	data.flags = MMC_DATA_READ;  	data.sg = &sg;  	data.sg_len = 1; +	mmc_set_data_timeout(&data, card);  	mrq.cmd = &cmd;  	mrq.data = &data;  |