154 lines
5.4 KiB
Diff
154 lines
5.4 KiB
Diff
From 08640edf1ce99ba02985af9a3ea500836365cebf Mon Sep 17 00:00:00 2001
|
|
From: Luo Jiaxing <luojiaxing@huawei.com>
|
|
Date: Fri, 6 Sep 2019 20:55:34 +0800
|
|
Subject: [PATCH 020/108] scsi: hisi_sas: Remove some unused function arguments
|
|
|
|
mainline inclusion
|
|
from mainline-v5.4-rc1
|
|
commit 4bc058097aa8b1af046fa000fbc6bf5408ace9bf
|
|
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=4bc058097aa8b1af046fa000fbc6bf5408ace9bf
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Some function arguments are unused, so remove them.
|
|
|
|
Also move the timeout print in for wait_cmds_complete_timeout_vX_hw()
|
|
callsites into that same function.
|
|
|
|
Link: https://lore.kernel.org/r/1567774537-20003-11-git-send-email-john.garry@huawei.com
|
|
Signed-off-by: Luo Jiaxing <luojiaxing@huawei.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>
|
|
|
|
Conflicts:
|
|
drivers/scsi/hisi_sas/hisi_sas.h
|
|
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
|
|
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
---
|
|
drivers/scsi/hisi_sas/hisi_sas.h | 2 +-
|
|
drivers/scsi/hisi_sas/hisi_sas_main.c | 5 ++---
|
|
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 9 +++++----
|
|
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 15 ++++++---------
|
|
4 files changed, 14 insertions(+), 17 deletions(-)
|
|
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
|
|
index ba4470bf99da..4b974461cb41 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas.h
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
|
|
@@ -348,7 +348,7 @@ struct hisi_sas_hw {
|
|
u32 (*get_phys_state)(struct hisi_hba *hisi_hba);
|
|
int (*write_gpio)(struct hisi_hba *hisi_hba, u8 reg_type,
|
|
u8 reg_index, u8 reg_count, u8 *write_data);
|
|
- int (*wait_cmds_complete_timeout)(struct hisi_hba *hisi_hba,
|
|
+ void (*wait_cmds_complete_timeout)(struct hisi_hba *hisi_hba,
|
|
int delay_ms, int timeout_ms);
|
|
void (*snapshot_prepare)(struct hisi_hba *hisi_hba);
|
|
void (*snapshot_restore)(struct hisi_hba *hisi_hba);
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
index bb8d872958c1..7df98ca85e86 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
@@ -1438,8 +1438,7 @@ static void hisi_sas_refresh_port_id(struct hisi_hba *hisi_hba)
|
|
}
|
|
}
|
|
|
|
-static void hisi_sas_rescan_topology(struct hisi_hba *hisi_hba, u32 old_state,
|
|
- u32 state)
|
|
+static void hisi_sas_rescan_topology(struct hisi_hba *hisi_hba, u32 state)
|
|
{
|
|
struct sas_ha_struct *sas_ha = &hisi_hba->sha;
|
|
struct asd_sas_port *_sas_port = NULL;
|
|
@@ -1615,7 +1614,7 @@ void hisi_sas_controller_reset_done(struct hisi_hba *hisi_hba)
|
|
clear_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags);
|
|
|
|
state = hisi_hba->hw->get_phys_state(hisi_hba);
|
|
- hisi_sas_rescan_topology(hisi_hba, hisi_hba->phy_state, state);
|
|
+ hisi_sas_rescan_topology(hisi_hba, state);
|
|
}
|
|
EXPORT_SYMBOL_GPL(hisi_sas_controller_reset_done);
|
|
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
|
|
index a835487fd406..55faa3ec72f9 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
|
|
@@ -3521,7 +3521,7 @@ static int write_gpio_v2_hw(struct hisi_hba *hisi_hba, u8 reg_type,
|
|
return 0;
|
|
}
|
|
|
|
-static int wait_cmds_complete_timeout_v2_hw(struct hisi_hba *hisi_hba,
|
|
+static void wait_cmds_complete_timeout_v2_hw(struct hisi_hba *hisi_hba,
|
|
int delay_ms, int timeout_ms)
|
|
{
|
|
struct device *dev = hisi_hba->dev;
|
|
@@ -3536,12 +3536,13 @@ static int wait_cmds_complete_timeout_v2_hw(struct hisi_hba *hisi_hba,
|
|
msleep(delay_ms);
|
|
}
|
|
|
|
- if (time >= timeout_ms)
|
|
- return -ETIMEDOUT;
|
|
+ if (time >= timeout_ms) {
|
|
+ dev_dbg(dev, "Wait commands complete timeout!\n");
|
|
+ return;
|
|
+ }
|
|
|
|
dev_dbg(dev, "wait commands complete %dms\n", time);
|
|
|
|
- return 0;
|
|
}
|
|
|
|
struct device_attribute *host_attrs_v2_hw[] = {
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
index eee696afb28d..e55442525ae6 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
@@ -2978,7 +2978,7 @@ static int write_gpio_v3_hw(struct hisi_hba *hisi_hba, u8 reg_type,
|
|
return 0;
|
|
}
|
|
|
|
-static int wait_cmds_complete_timeout_v3_hw(struct hisi_hba *hisi_hba,
|
|
+static void wait_cmds_complete_timeout_v3_hw(struct hisi_hba *hisi_hba,
|
|
int delay_ms, int timeout_ms)
|
|
{
|
|
struct device *dev = hisi_hba->dev;
|
|
@@ -2993,12 +2993,12 @@ static int wait_cmds_complete_timeout_v3_hw(struct hisi_hba *hisi_hba,
|
|
msleep(delay_ms);
|
|
}
|
|
|
|
- if (time >= timeout_ms)
|
|
- return -ETIMEDOUT;
|
|
+ if (time >= timeout_ms) {
|
|
+ dev_dbg(dev, "Wait commands complete timeout!\n");
|
|
+ return;
|
|
+ }
|
|
|
|
dev_dbg(dev, "wait commands complete %dms\n", time);
|
|
-
|
|
- return 0;
|
|
}
|
|
|
|
static ssize_t intr_conv_show(struct device *dev,
|
|
@@ -3280,15 +3280,12 @@ static const struct hisi_sas_debugfs_reg debugfs_ras_reg = {
|
|
|
|
static void debugfs_snapshot_prepare_v3_hw(struct hisi_hba *hisi_hba)
|
|
{
|
|
- struct device *dev = hisi_hba->dev;
|
|
-
|
|
set_bit(HISI_SAS_REJECT_CMD_BIT, &hisi_hba->flags);
|
|
|
|
hisi_sas_write32(hisi_hba, DLVRY_QUEUE_ENABLE, 0);
|
|
|
|
/* delay:100ms, timeout:5s */
|
|
- if (wait_cmds_complete_timeout_v3_hw(hisi_hba, 100, 5000) == -ETIMEDOUT)
|
|
- dev_dbg(dev, "Wait commands complete timeout!\n");
|
|
+ wait_cmds_complete_timeout_v3_hw(hisi_hba, 100, 5000);
|
|
|
|
hisi_sas_kill_tasklets(hisi_hba);
|
|
}
|
|
--
|
|
2.27.0
|
|
|