scsi: mpi3mr: Pass queue_limits to bsg_setup_queue()

Pass the limits to bsg_setup_queue() instead of setting them up on the live
queue.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20240409143748.980206-4-hch@lst.de
Reviewed-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/mpi3mr/mpi3mr_app.c b/drivers/scsi/mpi3mr/mpi3mr_app.c
index a45406fae2629b0e15e28a3c31dada025873e157..3c309e8c3a2bc8273475a3dd98d0be5c6deefb4a 100644 (file)
--- a/drivers/scsi/mpi3mr/mpi3mr_app.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_app.c
@@ -1845,6 +1845,10 @@ void mpi3mr_bsg_init(struct mpi3mr_ioc *mrioc)
 {
        struct device *bsg_dev = &mrioc->bsg_dev;
        struct device *parent = &mrioc->shost->shost_gendev;
+       struct queue_limits lim = {
+               .max_hw_sectors         = MPI3MR_MAX_APP_XFER_SECTORS,
+               .max_segments           = MPI3MR_MAX_APP_XFER_SEGMENTS,
+       };
 
        device_initialize(bsg_dev);
 
@@ -1860,20 +1864,14 @@ void mpi3mr_bsg_init(struct mpi3mr_ioc *mrioc)
                return;
        }
 
-       mrioc->bsg_queue = bsg_setup_queue(bsg_dev, dev_name(bsg_dev), NULL,
+       mrioc->bsg_queue = bsg_setup_queue(bsg_dev, dev_name(bsg_dev), &lim,
                        mpi3mr_bsg_request, NULL, 0);
        if (IS_ERR(mrioc->bsg_queue)) {
                ioc_err(mrioc, "%s: bsg registration failed\n",
                    dev_name(bsg_dev));
                device_del(bsg_dev);
                put_device(bsg_dev);
-               return;
        }
-
-       blk_queue_max_segments(mrioc->bsg_queue, MPI3MR_MAX_APP_XFER_SEGMENTS);
-       blk_queue_max_hw_sectors(mrioc->bsg_queue, MPI3MR_MAX_APP_XFER_SECTORS);
-
-       return;
 }
 
 /**