From: Kiyoshi Ueda Date: Wed, 1 Oct 2008 14:12:15 +0000 (-0400) Subject: memstick: change to use __blk_end_request() X-Git-Tag: v2.6.28-rc1~733^2~14 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2a9df5055a99df25533daf4041fdb99f0ed3463c;p=linux-2.6-omap-h63xx.git memstick: change to use __blk_end_request() This patch converts memstick to use __blk_end_request() directly so that end_{queued|dequeued}_request() can be removed. Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura Cc: Alex Dubov Signed-off-by: Jens Axboe --- diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c index 82bf649ef13..6e291bf8237 100644 --- a/drivers/memstick/core/mspro_block.c +++ b/drivers/memstick/core/mspro_block.c @@ -828,7 +828,7 @@ static void mspro_block_submit_req(struct request_queue *q) if (msb->eject) { while ((req = elv_next_request(q)) != NULL) - end_queued_request(req, -ENODEV); + __blk_end_request(req, -ENODEV, blk_rq_bytes(req)); return; }