Skip to content

Commit 262d431

Browse files
Christoph Hellwigaxboe
authored andcommitted
pd: use blk_mq_alloc_disk and blk_cleanup_disk
Use blk_mq_alloc_disk and blk_cleanup_disk to simplify the gendisk and request_queue allocation. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> Link: https://lore.kernel.org/r/20210602065345.355274-22-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 6759b1a commit 262d431

File tree

1 file changed

+12
-18
lines changed
  • drivers/block/paride

1 file changed

+12
-18
lines changed

drivers/block/paride/pd.c

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -879,18 +879,6 @@ static void pd_probe_drive(struct pd_unit *disk)
879879
{
880880
struct gendisk *p;
881881

882-
p = alloc_disk(1 << PD_BITS);
883-
if (!p)
884-
return;
885-
886-
strcpy(p->disk_name, disk->name);
887-
p->fops = &pd_fops;
888-
p->major = major;
889-
p->first_minor = (disk - pd) << PD_BITS;
890-
p->events = DISK_EVENT_MEDIA_CHANGE;
891-
disk->gd = p;
892-
p->private_data = disk;
893-
894882
memset(&disk->tag_set, 0, sizeof(disk->tag_set));
895883
disk->tag_set.ops = &pd_mq_ops;
896884
disk->tag_set.cmd_size = sizeof(struct pd_req);
@@ -903,14 +891,21 @@ static void pd_probe_drive(struct pd_unit *disk)
903891
if (blk_mq_alloc_tag_set(&disk->tag_set))
904892
return;
905893

906-
p->queue = blk_mq_init_queue(&disk->tag_set);
907-
if (IS_ERR(p->queue)) {
894+
p = blk_mq_alloc_disk(&disk->tag_set, disk);
895+
if (!p) {
908896
blk_mq_free_tag_set(&disk->tag_set);
909-
p->queue = NULL;
910897
return;
911898
}
899+
disk->gd = p;
900+
901+
strcpy(p->disk_name, disk->name);
902+
p->fops = &pd_fops;
903+
p->major = major;
904+
p->first_minor = (disk - pd) << PD_BITS;
905+
p->minors = 1 << PD_BITS;
906+
p->events = DISK_EVENT_MEDIA_CHANGE;
907+
p->private_data = disk;
912908

913-
p->queue->queuedata = disk;
914909
blk_queue_max_hw_sectors(p->queue, cluster);
915910
blk_queue_bounce_limit(p->queue, BLK_BOUNCE_HIGH);
916911

@@ -1019,9 +1014,8 @@ static void __exit pd_exit(void)
10191014
if (p) {
10201015
disk->gd = NULL;
10211016
del_gendisk(p);
1022-
blk_cleanup_queue(p->queue);
10231017
blk_mq_free_tag_set(&disk->tag_set);
1024-
put_disk(p);
1018+
blk_cleanup_disk(p);
10251019
pi_release(disk->pi);
10261020
}
10271021
}

0 commit comments

Comments
 (0)