aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-io.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2009-04-18 19:46:03 -0400
committerTejun Heo <tj@kernel.org>2009-04-18 19:46:03 -0400
commit2c316bb57ad4e9f0f3de2d7ef1ae85530c2a7e69 (patch)
tree4c67b1e6d0f1c27940188833a46a51b82e43d6ec /drivers/ide/ide-io.c
parent6d7003877c2f0578f1c08f66d05c3f72ef4ae596 (diff)
ide: drop rq->data handling from ide_map_sg()
Impact: remove code path which is no longer necessary All IDE data transfers now use rq->bio. Simplify ide_map_sg() accordingly. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/ide/ide-io.c')
-rw-r--r--drivers/ide/ide-io.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 6e3094e22775..a0309ea661ac 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -248,11 +248,7 @@ void ide_map_sg(ide_drive_t *drive, struct ide_cmd *cmd)
248 struct scatterlist *sg = hwif->sg_table; 248 struct scatterlist *sg = hwif->sg_table;
249 struct request *rq = cmd->rq; 249 struct request *rq = cmd->rq;
250 250
251 if (!rq->bio) { 251 cmd->sg_nents = blk_rq_map_sg(drive->queue, rq, sg);
252 sg_init_one(sg, rq->data, rq->data_len);
253 cmd->sg_nents = 1;
254 } else
255 cmd->sg_nents = blk_rq_map_sg(drive->queue, rq, sg);
256} 252}
257EXPORT_SYMBOL_GPL(ide_map_sg); 253EXPORT_SYMBOL_GPL(ide_map_sg);
258 254