Merge tag 'for-6.1/block-2022-10-03' of git://git.kernel.dk/linux

[linux-block.git] / drivers / scsi / mpt3sas / mpt3sas_scsih.c

diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index bd6a5f1bd532b1506fdc7ac58fcc876e1adf5a33..791a406b4f8e5872b3f0eee7758f0b2c97d1bc40 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -11872,7 +11872,7 @@ out:
  * scsih_map_queues - map reply queues with request queues
  * @shost: SCSI host pointer
  */
-static int scsih_map_queues(struct Scsi_Host *shost)
+static void scsih_map_queues(struct Scsi_Host *shost)
 {
        struct MPT3SAS_ADAPTER *ioc =
            (struct MPT3SAS_ADAPTER *)shost->hostdata;
@@ -11882,7 +11882,7 @@ static int scsih_map_queues(struct Scsi_Host *shost)
        int iopoll_q_count = ioc->reply_queue_count - nr_msix_vectors;
 
        if (shost->nr_hw_queues == 1)
-               return 0;
+               return;
 
        for (i = 0, qoff = 0; i < shost->nr_maps; i++) {
                map = &shost->tag_set.map[i];
@@ -11910,7 +11910,6 @@ static int scsih_map_queues(struct Scsi_Host *shost)
 
                qoff += map->nr_queues;
        }
-       return 0;
 }
 
 /* shost template for SAS 2.0 HBA devices */