Drop 'size' argument from bio_endio and bi_end_io

As bi_end_io is only called once when the reqeust is complete,
the 'size' argument is now redundant.  Remove it.

Now there is no need for bio_endio to subtract the size completed
from bi_size.  So don't do that either.

While we are at it, change bi_end_io to return void.

Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c
index 354a060e5bec..0fbacc8b1063 100644
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
@@ -230,12 +230,10 @@ static int xpram_make_request(struct request_queue *q, struct bio *bio)
                 }
         }
         set_bit(BIO_UPTODATE, &bio->bi_flags);
-        bytes = bio->bi_size;
-        bio->bi_size = 0;
-        bio->bi_end_io(bio, bytes, 0);
+        bio_end_io(bio, 0);
         return 0;
 fail:
-        bio_io_error(bio, bio->bi_size);
+        bio_io_error(bio);
         return 0;
 }