summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/mmc_block.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-09-07 15:57:12 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-09-07 15:57:12 +0100
commitd773d7255199a6c8934e197756f54a1115dd127b (patch)
tree940cb1f15be1d27508927ad40d0262fbec462437 /drivers/mmc/mmc_block.c
parent148f93d59cc9bb5e0f9a04d36a6f91d435e1a3f7 (diff)
downloadlinux-d773d7255199a6c8934e197756f54a1115dd127b.tar.gz
linux-d773d7255199a6c8934e197756f54a1115dd127b.tar.bz2
linux-d773d7255199a6c8934e197756f54a1115dd127b.zip
[MMC] Cleanup 385e3227d4d83ab13d7767c4bb3593b0256bf246
Rather than having two places which independently calculate the timeout for data transfers, make it a library function instead. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc/mmc_block.c')
-rw-r--r--drivers/mmc/mmc_block.c35
1 files changed, 1 insertions, 34 deletions
diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c
index 515fb227eba7..d6fcc467b503 100644
--- a/drivers/mmc/mmc_block.c
+++ b/drivers/mmc/mmc_block.c
@@ -179,40 +179,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
brq.stop.arg = 0;
brq.stop.flags = MMC_RSP_R1B | MMC_CMD_AC;
- brq.data.timeout_ns = card->csd.tacc_ns * 10;
- brq.data.timeout_clks = card->csd.tacc_clks * 10;
-
- /*
- * Scale up the timeout by the r2w factor
- */
- if (rq_data_dir(req) == WRITE) {
- brq.data.timeout_ns <<= card->csd.r2w_factor;
- brq.data.timeout_clks <<= card->csd.r2w_factor;
- }
-
- /*
- * SD cards use a 100 multiplier and has a upper limit
- */
- if (mmc_card_sd(card)) {
- unsigned int limit_us, timeout_us;
-
- brq.data.timeout_ns *= 10;
- brq.data.timeout_clks *= 10;
-
- if (rq_data_dir(req) == READ)
- limit_us = 100000;
- else
- limit_us = 250000;
-
- timeout_us = brq.data.timeout_ns / 1000;
- timeout_us += brq.data.timeout_clks * 1000 /
- (card->host->ios.clock / 1000);
-
- if (timeout_us > limit_us) {
- brq.data.timeout_ns = limit_us * 1000;
- brq.data.timeout_clks = 0;
- }
- }
+ mmc_set_data_timeout(&brq.data, card, rq_data_dir(req) != READ);
if (rq_data_dir(req) == READ) {
brq.cmd.opcode = brq.data.blocks > 1 ? MMC_READ_MULTIPLE_BLOCK : MMC_READ_SINGLE_BLOCK;