lkml.org 
[lkml]   [2022]   [Oct]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH 06/18] floppy: use init disk helper
    Date
    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@nvidia.com>
    ---
    drivers/block/floppy.c | 8 ++------
    1 file changed, 2 insertions(+), 6 deletions(-)

    diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
    index ccad3d7b3ddd..7304fd87c038 100644
    --- a/drivers/block/floppy.c
    +++ b/drivers/block/floppy.c
    @@ -4516,18 +4516,14 @@ static int floppy_alloc_disk(unsigned int drive, unsigned int type)
    return PTR_ERR(disk);

    blk_queue_max_hw_sectors(disk->queue, 64);
    - disk->major = FLOPPY_MAJOR;
    - disk->first_minor = TOMINOR(drive) | (type << 2);
    - disk->minors = 1;
    - disk->fops = &floppy_fops;
    disk->flags |= GENHD_FL_NO_PART;
    disk->events = DISK_EVENT_MEDIA_CHANGE;
    + init_disk(disk, FLOPPY_MAJOR, TOMINOR(drive) | (type << 2), 1, 0,
    + (void *)(long)drive, &floppy_fops);
    if (type)
    sprintf(disk->disk_name, "fd%d_type%d", drive, type);
    else
    sprintf(disk->disk_name, "fd%d", drive);
    - /* to be cleaned up... */
    - disk->private_data = (void *)(long)drive;
    disk->flags |= GENHD_FL_REMOVABLE;

    disks[drive][type] = disk;
    --
    2.29.0
    \
     
     \ /
      Last update: 2022-10-05 07:03    [W:3.525 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site