From: Tejun Heo <tj@kernel.org>
Date: Sat, 18 Apr 2009 23:46:03 +0000 (+0900)
Subject: ide: drop rq->data handling from ide_map_sg()
X-Git-Tag: firefly_0821_release~13979^2~126
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5ad960fe8d0e4f99fe2b8dded45e8251137293c9;p=firefly-linux-kernel-4.4.55.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 <tj@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
---

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);