]> git.baikalelectronics.ru Git - kernel.git/commitdiff
scsi: pm8001: Rework shost initial values
authorJohn Garry <john.garry@huawei.com>
Fri, 10 Jun 2022 16:46:39 +0000 (00:46 +0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 17 Jun 2022 01:45:08 +0000 (21:45 -0400)
Some values in pm8001_prep_sas_ha_init() are set the same as they would be
set in scsi_host_alloc(), or could be in the sht (which would be better),
or later just overwritten, so rework the following:

 - cmd_per_lun can be set in the sht

 - max_lun and max_channel are as scsi_host_alloc() (so no need to set)

 - can_queue is later overwritten (so don't set in
   pm8001_prep_sas_ha_init())

Link: https://lore.kernel.org/r/1654879602-33497-2-git-send-email-john.garry@huawei.com
Tested-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Acked-by: Jack Wang <jinpu.wang@ionos.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/pm8001/pm8001_init.c

index 9b04f1a6a67d7c807b886c2da899db459b1afcaa..4288c6b8f041e63c5b84155fd293d891d237db0c 100644 (file)
@@ -109,6 +109,7 @@ static struct scsi_host_template pm8001_sht = {
 #endif
        .shost_groups           = pm8001_host_groups,
        .track_queue_depth      = 1,
+       .cmd_per_lun            = 32,
 };
 
 /*
@@ -605,12 +606,8 @@ static int pm8001_prep_sas_ha_init(struct Scsi_Host *shost,
 
        shost->transportt = pm8001_stt;
        shost->max_id = PM8001_MAX_DEVICES;
-       shost->max_lun = 8;
-       shost->max_channel = 0;
        shost->unique_id = pm8001_id;
        shost->max_cmd_len = 16;
-       shost->can_queue = PM8001_CAN_QUEUE;
-       shost->cmd_per_lun = 32;
        return 0;
 exit_free1:
        kfree(arr_port);