90 lines
3.2 KiB
Diff
90 lines
3.2 KiB
Diff
From 17bc9c66f66d914e10cae2d2acb31b9a0d3cc1ed Mon Sep 17 00:00:00 2001
|
|
From: Vaibhav Gupta <vaibhavgupta40@gmail.com>
|
|
Date: Tue, 3 Aug 2021 14:47:25 +0800
|
|
Subject: [PATCH 106/108] scsi: hisi_sas_v3_hw: Remove extra function calls for
|
|
runtime pm
|
|
|
|
mainline inclusion
|
|
from mainline-v5.11-rc1
|
|
commit 71c8f15e1dbcd202f0b27d7560ce191c5a3b7286
|
|
category: bugfix
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8F81U
|
|
CVE: NA
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=71c8f15e1dbcd202f0b27d7560ce191c5a3b7286
|
|
|
|
------------------------------------------------------------------------
|
|
|
|
Both runtime_suspend_v3_hw() and runtime_resume_v3_hw() do nothing else but
|
|
invoke suspend_v3_hw() and resume_v3_hw() respectively. This is the case of
|
|
unnecessary function calls. To use those functions for runtime pm as well,
|
|
simply use UNIVERSAL_DEV_PM_OPS.
|
|
|
|
make -j$(nproc) W=1, with CONFIG_PM disabled, throws '-Wunused-function'
|
|
warning for runtime_suspend_v3_hw() and runtime_resume_v3_hw(). After
|
|
dropping those function definitions, the warning was thrown for
|
|
suspend_v3_hw() and resume_v3_hw(). Hence, mark them as '__maybe_unused'.
|
|
|
|
Link: https://lore.kernel.org/r/20201102164730.324035-15-vaibhavgupta40@gmail.com
|
|
Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.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 | 23 ++++++-----------------
|
|
1 file changed, 6 insertions(+), 17 deletions(-)
|
|
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
index 0d5135fb0b37..db43cd17b615 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
@@ -5509,7 +5509,7 @@ static int _resume_v3_hw(struct device *device)
|
|
return 0;
|
|
}
|
|
|
|
-static int suspend_v3_hw(struct device *device)
|
|
+static int __maybe_unused suspend_v3_hw(struct device *device)
|
|
{
|
|
struct pci_dev *pdev = to_pci_dev(device);
|
|
struct sas_ha_struct *sha = pci_get_drvdata(pdev);
|
|
@@ -5525,7 +5525,7 @@ static int suspend_v3_hw(struct device *device)
|
|
return rc;
|
|
}
|
|
|
|
-static int resume_v3_hw(struct device *device)
|
|
+static int __maybe_unused resume_v3_hw(struct device *device)
|
|
{
|
|
struct pci_dev *pdev = to_pci_dev(device);
|
|
struct sas_ha_struct *sha = pci_get_drvdata(pdev);
|
|
@@ -5548,21 +5548,10 @@ static const struct pci_error_handlers hisi_sas_err_handler = {
|
|
.reset_done = hisi_sas_reset_done_v3_hw,
|
|
};
|
|
|
|
-static int runtime_suspend_v3_hw(struct device *dev)
|
|
-{
|
|
- return suspend_v3_hw(dev);
|
|
-}
|
|
-
|
|
-static int runtime_resume_v3_hw(struct device *dev)
|
|
-{
|
|
- return resume_v3_hw(dev);
|
|
-}
|
|
-
|
|
-static const struct dev_pm_ops hisi_sas_v3_pm_ops = {
|
|
- SET_SYSTEM_SLEEP_PM_OPS(suspend_v3_hw, resume_v3_hw)
|
|
- SET_RUNTIME_PM_OPS(runtime_suspend_v3_hw,
|
|
- runtime_resume_v3_hw, NULL)
|
|
-};
|
|
+static UNIVERSAL_DEV_PM_OPS(hisi_sas_v3_pm_ops,
|
|
+ suspend_v3_hw,
|
|
+ resume_v3_hw,
|
|
+ NULL);
|
|
|
|
static struct pci_driver sas_v3_pci_driver = {
|
|
.name = DRV_NAME,
|
|
--
|
|
2.27.0
|
|
|