aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/paride
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2006-09-30 14:29:12 -0400
committerJens Axboe <axboe@kernel.dk>2006-09-30 14:29:12 -0400
commitc00895ab2f08df7044e58ee01c38bf0a661ea0eb (patch)
tree95dee4eb76042087c4b8d43a5841b6bae85b8cf3 /drivers/block/paride
parent8a8e674cb1dafc818ffea93d97e4c1c1f01fdbb6 (diff)
[PATCH] Remove ->waiting member from struct request
As the comments indicates in blkdev.h, we can fold it into ->end_io_data usage as that is really what ->waiting is. Fixup the users of blk_end_sync_rq(). Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/paride')
-rw-r--r--drivers/block/paride/pd.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index 12ff1a274d9..500d2ebb41e 100644
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -722,11 +722,10 @@ static int pd_special_command(struct pd_unit *disk,
722 rq.rq_status = RQ_ACTIVE; 722 rq.rq_status = RQ_ACTIVE;
723 rq.rq_disk = disk->gd; 723 rq.rq_disk = disk->gd;
724 rq.ref_count = 1; 724 rq.ref_count = 1;
725 rq.waiting = &wait; 725 rq.end_io_data = &wait;
726 rq.end_io = blk_end_sync_rq; 726 rq.end_io = blk_end_sync_rq;
727 blk_insert_request(disk->gd->queue, &rq, 0, func); 727 blk_insert_request(disk->gd->queue, &rq, 0, func);
728 wait_for_completion(&wait); 728 wait_for_completion(&wait);
729 rq.waiting = NULL;
730 if (rq.errors) 729 if (rq.errors)
731 err = -EIO; 730 err = -EIO;
732 blk_put_request(&rq); 731 blk_put_request(&rq);