diff options
author | NeilBrown <neilb@suse.de> | 2007-09-27 06:47:43 -0400 |
---|---|---|
committer | Jens Axboe <axboe@carl.home.kernel.dk> | 2007-10-10 03:25:57 -0400 |
commit | 6712ecf8f648118c3363c142196418f89a510b90 (patch) | |
tree | 347d39a7d5a7ed96d3b1afecd28de2a0f98b98c9 /drivers/block/floppy.c | |
parent | 5bb23a688b2de23d7765a1dd439d89c038378978 (diff) |
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>
Diffstat (limited to 'drivers/block/floppy.c')
-rw-r--r-- | drivers/block/floppy.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index f0a86e201b44..80483aac4cc9 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c | |||
@@ -3810,14 +3810,10 @@ static int check_floppy_change(struct gendisk *disk) | |||
3810 | * a disk in the drive, and whether that disk is writable. | 3810 | * a disk in the drive, and whether that disk is writable. |
3811 | */ | 3811 | */ |
3812 | 3812 | ||
3813 | static int floppy_rb0_complete(struct bio *bio, unsigned int bytes_done, | 3813 | static void floppy_rb0_complete(struct bio *bio, |
3814 | int err) | 3814 | int err) |
3815 | { | 3815 | { |
3816 | if (bio->bi_size) | ||
3817 | return 1; | ||
3818 | |||
3819 | complete((struct completion *)bio->bi_private); | 3816 | complete((struct completion *)bio->bi_private); |
3820 | return 0; | ||
3821 | } | 3817 | } |
3822 | 3818 | ||
3823 | static int __floppy_read_block_0(struct block_device *bdev) | 3819 | static int __floppy_read_block_0(struct block_device *bdev) |