From: Tejun Heo Date: Sat, 18 Apr 2009 23:46:03 +0000 (+0900) Subject: ide: drop rq->data handling from ide_map_sg() X-Git-Tag: v2.6.31-rc1~397^2~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2c316bb57ad4e9f0f3de2d7ef1ae85530c2a7e69;p=platform%2Fkernel%2Flinux-exynos.git 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 Cc: Jens Axboe --- diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 6e3094e..a0309ea 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);