Commit 586cf268 authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe

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: default avatarTejun Heo <tj@kernel.org>
parent 5ad960fe
...@@ -510,23 +510,11 @@ ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error) ...@@ -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 * un-busy drive etc and make sure request is sane
*/ */
rq = hwif->rq; rq = hwif->rq;
if (!rq) if (rq) {
goto out;
hwif->rq = NULL; hwif->rq = NULL;
rq->errors = 0; 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:
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment