From: Martin K. Petersen Date: Sat, 25 Mar 2023 00:13:03 +0000 (-0400) Subject: Merge patch series "Constify most SCSI host templates" X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=62d15dba0aa4448c15da9c9443018c70fc2527b2;p=linux.git Merge patch series "Constify most SCSI host templates" Bart Van Assche says: It helps humans and the compiler if it is made explicit that SCSI host templates are not modified. Hence this patch series that constifies most SCSI host templates. Please consider this patch series for the next merge window. Link: https://lore.kernel.org/r/20230322195515.1267197-1-bvanassche@acm.org Signed-off-by: Martin K. Petersen --- 62d15dba0aa4448c15da9c9443018c70fc2527b2 diff --cc drivers/scsi/arcmsr/arcmsr_hba.c index 6a0951dca93f3,32bc77200eaaf..2cd12c7f06c66 --- a/drivers/scsi/arcmsr/arcmsr_hba.c +++ b/drivers/scsi/arcmsr/arcmsr_hba.c @@@ -151,9 -152,8 +151,9 @@@ static int arcmsr_adjust_disk_queue_dep return scsi_change_queue_depth(sdev, queue_depth); } - static struct scsi_host_template arcmsr_scsi_host_template = { + static const struct scsi_host_template arcmsr_scsi_host_template = { .module = THIS_MODULE, + .proc_name = ARCMSR_NAME, .name = "Areca SAS/SATA RAID driver", .info = arcmsr_info, .queuecommand = arcmsr_queue_command, diff --cc drivers/scsi/hisi_sas/hisi_sas_v3_hw.c index 8d0e2dd6207aa,d65ba65b6dac4..c55bef584a9bb --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c @@@ -3255,34 -3211,12 +3255,34 @@@ static int debugfs_set_bist_v3_hw(struc static void hisi_sas_map_queues(struct Scsi_Host *shost) { struct hisi_hba *hisi_hba = shost_priv(shost); - struct blk_mq_queue_map *qmap = &shost->tag_set.map[HCTX_TYPE_DEFAULT]; + struct blk_mq_queue_map *qmap; + int i, qoff; + + for (i = 0, qoff = 0; i < shost->nr_maps; i++) { + qmap = &shost->tag_set.map[i]; + if (i == HCTX_TYPE_DEFAULT) { + qmap->nr_queues = hisi_hba->cq_nvecs; + } else if (i == HCTX_TYPE_POLL) { + qmap->nr_queues = hisi_hba->iopoll_q_cnt; + } else { + qmap->nr_queues = 0; + continue; + } - blk_mq_pci_map_queues(qmap, hisi_hba->pci_dev, BASE_VECTORS_V3_HW); + /* At least one interrupt hardware queue */ + if (!qmap->nr_queues) + WARN_ON(i == HCTX_TYPE_DEFAULT); + qmap->queue_offset = qoff; + if (i == HCTX_TYPE_POLL) + blk_mq_map_queues(qmap); + else + blk_mq_pci_map_queues(qmap, hisi_hba->pci_dev, + BASE_VECTORS_V3_HW); + qoff += qmap->nr_queues; + } } - static struct scsi_host_template sht_v3_hw = { + static const struct scsi_host_template sht_v3_hw = { .name = DRV_NAME, .proc_name = DRV_NAME, .module = THIS_MODULE,