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>

diff --git a/block/bsg-lib.c b/block/bsg-lib.c
index ee738d129a9f5e18ec43fe24ff02cdfbb89c01df..32da4a4429ce550f6cbf25bfb84026f1ae5bae45 100644 (file)
--- a/block/bsg-lib.c
+++ b/block/bsg-lib.c
@@ -385,13 +385,12 @@ struct request_queue *bsg_setup_queue(struct device *dev, const char *name,
        if (blk_mq_alloc_tag_set(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)) {
                ret = PTR_ERR(q);
                goto out_queue;
        }
 
-       q->queuedata = dev;
        blk_queue_rq_timeout(q, BLK_DEFAULT_SG_TIMEOUT);
 
        bset->bd = bsg_register_queue(q, dev, name, bsg_transport_sg_io_fn);