56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
From aa8d594c61620c3c36441b08b98380f3abb4d3af Mon Sep 17 00:00:00 2001
|
|
From: Xiang Chen <chenxiang66@hisilicon.com>
|
|
Date: Mon, 5 Aug 2019 21:48:10 +0800
|
|
Subject: [PATCH 014/108] scsi: hisi_sas: Remove some unnecessary code
|
|
|
|
mainline inclusion
|
|
from mainline-v5.4-rc1
|
|
commit a07b48766c5232b98154f68010512a9269f2841e
|
|
category: feature
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EKNE
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a07b48766c5232b98154f68010512a9269f2841e
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Remove some unnecessary code, including:
|
|
|
|
- Explicit zeroing of memory allocated for dmam_alloc_coherent()
|
|
|
|
- Some duplicated code
|
|
|
|
- Some redundant masking
|
|
|
|
Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
|
|
Signed-off-by: John Garry <john.garry@huawei.com>
|
|
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
Signed-off-by: YunYi Yang <yangyunyi2@huawei.com>
|
|
---
|
|
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 3 ---
|
|
1 file changed, 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 75161290bcc7..722ef2be390a 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
@@ -3543,8 +3543,6 @@ hisi_sas_shost_alloc_pci(struct pci_dev *pdev)
|
|
else
|
|
hisi_hba->enable_dix_dif = enable_dix_dif;
|
|
|
|
- timer_setup(&hisi_hba->timer, NULL, 0);
|
|
-
|
|
if (hisi_sas_get_fw_info(hisi_hba) < 0)
|
|
goto err_out;
|
|
|
|
@@ -3636,7 +3634,6 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|
sha->lldd_module = THIS_MODULE;
|
|
sha->sas_addr = &hisi_hba->sas_addr[0];
|
|
sha->num_phys = hisi_hba->n_phy;
|
|
- sha->core.shost = hisi_hba->shost;
|
|
|
|
for (i = 0; i < hisi_hba->n_phy; i++) {
|
|
sha->sas_phy[i] = &hisi_hba->phy[i].sas_phy;
|
|
--
|
|
2.27.0
|
|
|