61 lines
2.1 KiB
Diff
61 lines
2.1 KiB
Diff
From 2ac8249ba497e08f4839edced8a06e55561dd614 Mon Sep 17 00:00:00 2001
|
|
From: John Garry <john.garry@huawei.com>
|
|
Date: Tue, 3 Aug 2021 14:47:48 +0800
|
|
Subject: [PATCH 069/108] scsi: hisi_sas: Remove deferred probe check in
|
|
hisi_sas_v2_probe()
|
|
|
|
mainline inclusion
|
|
from mainline-v5.12-rc1
|
|
commit 4d287d8bae1f395b5e5d79bc9673dacab7975e36
|
|
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=4d287d8bae1f395b5e5d79bc9673dacab7975e36
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
The platform_get_irq() check for -EPROBE_DEFER was to ensure that all the
|
|
steps to add the SCSI host are not done and then only to realise that the
|
|
probe needs to be deferred.
|
|
|
|
However, since there is now an earlier check for this in
|
|
hisi_sas_interrupt_preinit(), this check is superfluous and may be removed.
|
|
|
|
Link: https://lore.kernel.org/r/1611659068-131975-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_v2_hw.c | 12 ------------
|
|
1 file changed, 12 deletions(-)
|
|
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
|
|
index 55331ffa3be5..078404d2754a 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
|
|
@@ -3600,18 +3600,6 @@ static const struct hisi_sas_hw hisi_sas_v2_hw = {
|
|
|
|
static int hisi_sas_v2_probe(struct platform_device *pdev)
|
|
{
|
|
- /*
|
|
- * Check if we should defer the probe before we probe the
|
|
- * upper layer, as it's hard to defer later on.
|
|
- */
|
|
- int ret = platform_get_irq(pdev, 0);
|
|
-
|
|
- if (ret < 0) {
|
|
- if (ret != -EPROBE_DEFER)
|
|
- dev_err(&pdev->dev, "cannot obtain irq\n");
|
|
- return ret;
|
|
- }
|
|
-
|
|
return hisi_sas_probe(pdev, &hisi_sas_v2_hw);
|
|
}
|
|
|
|
--
|
|
2.27.0
|
|
|