diff options
author | Tejun Heo <tj@kernel.org> | 2009-04-21 12:16:56 +0900 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2009-04-21 12:16:56 +0900 |
commit | 2ecf0a57c60dcb588f310d94412118e15c510532 (patch) | |
tree | 0491672f5c24b7a73493510eb5572c1ac034cb00 /drivers/ide/ide-dma.c | |
parent | 2c316bb57ad4e9f0f3de2d7ef1ae85530c2a7e69 (diff) | |
download | kernel_samsung_tuna-2ecf0a57c60dcb588f310d94412118e15c510532.zip kernel_samsung_tuna-2ecf0a57c60dcb588f310d94412118e15c510532.tar.gz kernel_samsung_tuna-2ecf0a57c60dcb588f310d94412118e15c510532.tar.bz2 |
ide-dma: don't reset request fields on dma_timeout_retry()
Impact: drop unnecessary code
Now that everything uses bio and block operations, there is no need to
reset request fields manually when retrying a request. Every field is
guaranteed to be always valid. Drop unnecessary request field
resetting from ide_dma_timeout_retry().
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ide/ide-dma.c')
-rw-r--r-- | drivers/ide/ide-dma.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index a0b8cab..d9123ec 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c @@ -510,23 +510,11 @@ ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error) /* * un-busy drive etc and make sure request is sane */ - rq = hwif->rq; - if (!rq) - goto out; - - hwif->rq = NULL; - - rq->errors = 0; - - if (!rq->bio) - goto out; - - rq->sector = rq->bio->bi_sector; - rq->current_nr_sectors = bio_iovec(rq->bio)->bv_len >> 9; - rq->hard_cur_sectors = rq->current_nr_sectors; - rq->buffer = bio_data(rq->bio); -out: + if (rq) { + hwif->rq = NULL; + rq->errors = 0; + } return ret; } |