68 lines
2.4 KiB
Diff
68 lines
2.4 KiB
Diff
From bb59b66d331e6f831a9230267ce23f5aaa042336 Mon Sep 17 00:00:00 2001
|
|
From: John Garry <john.garry@huawei.com>
|
|
Date: Tue, 3 Aug 2021 14:47:26 +0800
|
|
Subject: [PATCH 065/108] scsi: hisi_sas: Reduce some indirection in v3 hw
|
|
driver
|
|
|
|
mainline inclusion
|
|
from mainline-v5.11-rc1
|
|
commit bec99e5250bfe1c575e72a971bc2b2b21cf6c8b4
|
|
category: bugfix
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EKNE
|
|
CVE: NA
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=bec99e5250bfe1c575e72a971bc2b2b21cf6c8b4
|
|
|
|
------------------------------------------------------------------------
|
|
|
|
Sometimes local functions are called indirectly from the hw driver, which
|
|
only makes the code harder to follow. Remove these.
|
|
|
|
Method .hw_init is only called from platform driver probe, which is not
|
|
relevant, so don't set this either.
|
|
|
|
Link: https://lore.kernel.org/r/1606207594-196362-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>
|
|
Reviewed-by: Ouyangdelong <ouyangdelong@huawei.com>
|
|
Signed-off-by: Nifujia <nifujia1@hisilicon.com>
|
|
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
|
|
Signed-off-by: YunYi Yang <yangyunyi2@huawei.com>
|
|
---
|
|
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 5 ++---
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
index ed0d0a258145..3aea33e85a52 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
@@ -3549,7 +3549,6 @@ static struct scsi_host_template sht_v3_hw = {
|
|
};
|
|
|
|
static const struct hisi_sas_hw hisi_sas_v3_hw = {
|
|
- .hw_init = hisi_sas_v3_init,
|
|
.setup_itct = setup_itct_v3_hw,
|
|
.get_wideport_bitmap = get_wideport_bitmap_v3_hw,
|
|
.complete_hdr_size = sizeof(struct hisi_sas_complete_v3_hdr),
|
|
@@ -3729,7 +3728,7 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|
if (rc)
|
|
goto err_out_register_ha;
|
|
|
|
- rc = hisi_hba->hw->hw_init(hisi_hba);
|
|
+ rc = hisi_sas_v3_init(hisi_hba);
|
|
if (rc)
|
|
goto err_out_register_ha;
|
|
|
|
@@ -3923,7 +3922,7 @@ static int _resume_v3_hw(struct device *device)
|
|
pci_disable_device(pdev);
|
|
return rc;
|
|
}
|
|
- hisi_hba->hw->phys_init(hisi_hba);
|
|
+ phys_init_v3_hw(hisi_hba);
|
|
sas_resume_ha(sha);
|
|
clear_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags);
|
|
|
|
--
|
|
2.27.0
|
|
|