summary refs log tree commit diff
path: root/drivers/block/floppy.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-06-26 10:01:52 +0200
committerJens Axboe <axboe@kernel.dk>2020-07-01 08:08:08 -0600
commitfe4ec12e1865a2114056b799e4869bf4c30e47df (patch)
tree19bfd6b1461f30f15f8a3e05ab257a90b906222e /drivers/block/floppy.c
parent6e2fa4dd683a22a7697e7ff51dad499406094d28 (diff)
downloadlinux-fe4ec12e1865a2114056b799e4869bf4c30e47df.tar.gz
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>
Diffstat (limited to 'drivers/block/floppy.c')
-rw-r--r--drivers/block/floppy.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 3e9db22db2a8..09079aee8dc4 100644
--- 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);