scsi: bsg: Pass dev to blk_mq_alloc_queue()

When calling bsg_setup_queue() -> blk_mq_alloc_queue(), we don't pass
the dev as the queuedata, but rather manually set it afterwards. Just
pass dev to blk_mq_alloc_queue() to have automatically set.

Signed-off-by: John Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20240524084829.2132555-3-john.g.garry@oracle.com
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Tested-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
John Garry 2024-05-24 08:48:29 +00:00 committed by Martin K. Petersen
parent e7c09df178
commit 41b7574252

View File

@ -385,13 +385,12 @@ struct request_queue *bsg_setup_queue(struct device *dev, const char *name,
if (blk_mq_alloc_tag_set(set)) if (blk_mq_alloc_tag_set(set))
goto out_tag_set; goto out_tag_set;
q = blk_mq_alloc_queue(set, lim, NULL); q = blk_mq_alloc_queue(set, lim, dev);
if (IS_ERR(q)) { if (IS_ERR(q)) {
ret = PTR_ERR(q); ret = PTR_ERR(q);
goto out_queue; goto out_queue;
} }
q->queuedata = dev;
blk_queue_rq_timeout(q, BLK_DEFAULT_SG_TIMEOUT); blk_queue_rq_timeout(q, BLK_DEFAULT_SG_TIMEOUT);
bset->bd = bsg_register_queue(q, dev, name, bsg_transport_sg_io_fn); bset->bd = bsg_register_queue(q, dev, name, bsg_transport_sg_io_fn);