Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

gdrom: pass queue_limits to blk_mq_alloc_disk

Pass the few limits gdrom imposes directly to blk_mq_alloc_disk instead
of setting them one at a time.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20240215070300.2200308-11-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Christoph Hellwig and committed by
Jens Axboe
a339cf2b d0fa9a8b

+8 -6
+8 -6
drivers/cdrom/gdrom.c
··· 724 724 725 725 static int probe_gdrom_setupqueue(void) 726 726 { 727 - blk_queue_logical_block_size(gd.gdrom_rq, GDROM_HARD_SECTOR); 728 - /* using DMA so memory will need to be contiguous */ 729 - blk_queue_max_segments(gd.gdrom_rq, 1); 730 - /* set a large max size to get most from DMA */ 731 - blk_queue_max_segment_size(gd.gdrom_rq, 0x40000); 732 727 gd.disk->queue = gd.gdrom_rq; 733 728 return gdrom_init_dma_mode(); 734 729 } ··· 738 743 */ 739 744 static int probe_gdrom(struct platform_device *devptr) 740 745 { 746 + struct queue_limits lim = { 747 + .logical_block_size = GDROM_HARD_SECTOR, 748 + /* using DMA so memory will need to be contiguous */ 749 + .max_segments = 1, 750 + /* set a large max size to get most from DMA */ 751 + .max_segment_size = 0x40000, 752 + }; 741 753 int err; 742 754 743 755 /* ··· 780 778 if (err) 781 779 goto probe_fail_free_cd_info; 782 780 783 - gd.disk = blk_mq_alloc_disk(&gd.tag_set, NULL, NULL); 781 + gd.disk = blk_mq_alloc_disk(&gd.tag_set, &lim, NULL); 784 782 if (IS_ERR(gd.disk)) { 785 783 err = PTR_ERR(gd.disk); 786 784 goto probe_fail_free_tag_set;