scsi: hisi_sas: Call hisi_sas_slave_configure() from slave_configure_v3_hw()

There is duplicated code between slave_configure_v3_hw() and
hisi_sas_slave_configure(), so call common function
hisi_sas_slave_configure() from slave_configure_v3_hw().

Link: https://lore.kernel.org/r/1657823002-139010-2-git-send-email-john.garry@huawei.com
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index eb86afb21aabb692756693683c5c2c2bda21c183..76c4173e277d3d3bf2373d05b58a58071e8bf55f 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -2778,16 +2778,13 @@ static DEVICE_ATTR_RW(intr_coal_count_v3_hw);
 static int slave_configure_v3_hw(struct scsi_device *sdev)
 {
        struct Scsi_Host *shost = dev_to_shost(&sdev->sdev_gendev);
-       struct domain_device *ddev = sdev_to_domain_dev(sdev);
        struct hisi_hba *hisi_hba = shost_priv(shost);
+       int ret = hisi_sas_slave_configure(sdev);
        struct device *dev = hisi_hba->dev;
-       int ret = sas_slave_configure(sdev);
        unsigned int max_sectors;
 
        if (ret)
                return ret;
-       if (!dev_is_sata(ddev))
-               sas_change_queue_depth(sdev, 64);
 
        if (sdev->type == TYPE_ENCLOSURE)
                return 0;