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>
This commit is contained in:
parent
2c316bb57a
commit
2ecf0a57c6
|
@ -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;
|
||||||
|
rq->errors = 0;
|
||||||
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:
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue