diff options
| author | Tejun Heo <tj@kernel.org> | 2009-04-19 01:46:03 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-04-19 01:46:03 +0200 |
| commit | 2c316bb57ad4e9f0f3de2d7ef1ae85530c2a7e69 (patch) | |
| tree | 4c67b1e6d0f1c27940188833a46a51b82e43d6ec /drivers/ide/ide-io.c | |
| parent | ide-atapi: kill unused fields and callbacks (diff) | |
| download | linux-2c316bb57ad4e9f0f3de2d7ef1ae85530c2a7e69.tar.xz linux-2c316bb57ad4e9f0f3de2d7ef1ae85530c2a7e69.zip | |
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.c | 6 |
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); |