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> --- drivers/block/swim3.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c index da811a7da03f..3c1b92b464d1 100644 --- a/drivers/block/swim3.c +++ b/drivers/block/swim3.c @@ -1221,15 +1221,11 @@ static int swim3_attach(struct macio_dev *mdev, if (rc) goto out_cleanup_disk; - disk->major = FLOPPY_MAJOR; - disk->first_minor = floppy_count; - disk->minors = 1; - disk->fops = &floppy_fops; - disk->private_data = fs; disk->events = DISK_EVENT_MEDIA_CHANGE; disk->flags |= GENHD_FL_REMOVABLE | GENHD_FL_NO_PART; sprintf(disk->disk_name, "fd%d", floppy_count); - set_capacity(disk, 2880); + init_disk(swd->unit[drive].disk, FLOPPY_MAJOR, floppy_count, 1, 2880, + &fs, &floopy_dops); rc = add_disk(disk); if (rc) goto out_cleanup_disk; -- 2.29.0
