floppy: use block_size

Use the block_size helper instead of open coding it.  Also remove the
check for a 0 block size, as that can't happen.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 3e9db22..09079ae 100644 (file)
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4205,7 +4205,6 @@ static int __floppy_read_block_0(struct block_device *bdev, int drive)
        struct bio_vec bio_vec;
        struct page *page;
        struct rb0_cbdata cbdata;
-       size_t size;
 
        page = alloc_page(GFP_NOIO);
        if (!page) {
@@ -4213,15 +4212,11 @@ static int __floppy_read_block_0(struct block_device *bdev, int drive)
                return -ENOMEM;
        }
 
-       size = bdev->bd_block_size;
-       if (!size)
-               size = 1024;
-
        cbdata.drive = drive;
 
        bio_init(&bio, &bio_vec, 1);
        bio_set_dev(&bio, bdev);
-       bio_add_page(&bio, page, size, 0);
+       bio_add_page(&bio, page, block_size(bdev), 0);
 
        bio.bi_iter.bi_sector = 0;
        bio.bi_flags |= (1 << BIO_QUIET);