summaryrefslogtreecommitdiff
path: root/drivers/ide/ide-io.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2009-04-19 03:46:03 +0400
committerJens Axboe <jens.axboe@oracle.com>2009-04-28 09:37:32 +0400
commit5ad960fe8d0e4f99fe2b8dded45e8251137293c9 (patch)
treeb781a857b5bc7ed2ca13b852bda1da316d3f1f7a /drivers/ide/ide-io.c
parent29d1a4371035e01b0d079bc5aa88b50f5af7a566 (diff)
downloadlinux-5ad960fe8d0e4f99fe2b8dded45e8251137293c9.tar.xz
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)
struct scatterlist *sg = hwif->sg_table;
struct request *rq = cmd->rq;
- if (!rq->bio) {
- sg_init_one(sg, rq->data, rq->data_len);
- cmd->sg_nents = 1;
- } else
- cmd->sg_nents = blk_rq_map_sg(drive->queue, rq, sg);
+ cmd->sg_nents = blk_rq_map_sg(drive->queue, rq, sg);
}
EXPORT_SYMBOL_GPL(ide_map_sg);