aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/card/block.c
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2007-07-24 13:16:54 -0400
committerPierre Ossman <drzeus@drzeus.cx>2007-09-23 03:15:00 -0400
commitb146d26a61e0feab2f12a98ae83fd352830899c0 (patch)
treeb05f5197e6f5315197f34e3f406b93ad06b6b80b /drivers/mmc/card/block.c
parentd7604d76351f7745d0e62d9f2bbcbb917c9013f3 (diff)
mmc: mmc_set_data_timeout() parameter write is redundant
The write parameter in mmc_set_data_timeout() is redundant as the data structure contains information about the direction of the transfer. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc/card/block.c')
-rw-r--r--drivers/mmc/card/block.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 0da341acf32b..9abf29f8435b 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -229,8 +229,6 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
229 if (brq.data.blocks > card->host->max_blk_count) 229 if (brq.data.blocks > card->host->max_blk_count)
230 brq.data.blocks = card->host->max_blk_count; 230 brq.data.blocks = card->host->max_blk_count;
231 231
232 mmc_set_data_timeout(&brq.data, card, rq_data_dir(req) != READ);
233
234 /* 232 /*
235 * If the host doesn't support multiple block writes, force 233 * If the host doesn't support multiple block writes, force
236 * block writes to single block. SD cards are excepted from 234 * block writes to single block. SD cards are excepted from
@@ -261,6 +259,8 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
261 brq.data.flags |= MMC_DATA_WRITE; 259 brq.data.flags |= MMC_DATA_WRITE;
262 } 260 }
263 261
262 mmc_set_data_timeout(&brq.data, card);
263
264 brq.data.sg = mq->sg; 264 brq.data.sg = mq->sg;
265 brq.data.sg_len = mmc_queue_map_sg(mq); 265 brq.data.sg_len = mmc_queue_map_sg(mq);
266 266