Add and use the helper to initialize the common fields of struct gendisk such as major, first_minor, minors, disk_name, private_data, and ops. This initialization is spread all over the block drivers. This avoids code repetation of inialization code of gendisk in current block drivers and any future ones. Signed-off-by: Chaitanya Kulkarni <kch@xxxxxxxxxx> --- arch/m68k/emu/nfblock.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/m68k/emu/nfblock.c b/arch/m68k/emu/nfblock.c index a708fbd5a844..81d3d3edace6 100644 --- a/arch/m68k/emu/nfblock.c +++ b/arch/m68k/emu/nfblock.c @@ -121,13 +121,9 @@ static int __init nfhd_init_one(int id, u32 blocks, u32 bsize) if (!dev->disk) goto free_dev; - dev->disk->major = major_num; - dev->disk->first_minor = dev_id * 16; - dev->disk->minors = 16; - dev->disk->fops = &nfhd_ops; - dev->disk->private_data = dev; + init_disk(dev->disk, major_num, dev_id * 16, 16, + (sector_t)blocks * (bsize / 512), dev, &nfhd_ops); sprintf(dev->disk->disk_name, "nfhd%u", dev_id); - set_capacity(dev->disk, (sector_t)blocks * (bsize / 512)); blk_queue_logical_block_size(dev->disk->queue, bsize); err = add_disk(dev->disk); if (err) -- 2.29.0
