64 lines
2.5 KiB
Diff
64 lines
2.5 KiB
Diff
From ed7a3d9f50f2b0ec11531ed6973c830931f5248b Mon Sep 17 00:00:00 2001
|
|
From: Hao Chen <chenhao288@hisilicon.com>
|
|
Date: Tue, 28 Sep 2021 11:52:07 +0800
|
|
Subject: [PATCH 115/283] net: hns3: remove unnecessary "static" of local
|
|
variables in function
|
|
|
|
mainline inclusion
|
|
from mainline-v5.15-rc1
|
|
commit 1026b1534fa12a9dbdcebd34d417513fca4647f0
|
|
category: feature
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EMYT
|
|
CVE: NA
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1026b1534fa12a9dbdcebd34d417513fca4647f0
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Some local variable declarations are no need to add "static", so remove it.
|
|
|
|
Signed-off-by: Hao Chen <chenhao288@hisilicon.com>
|
|
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Reviewed-by: Yongxin Li <liyongxin1@huawei.com>
|
|
Signed-off-by: Junxin Chen <chenjunxin1@huawei.com>
|
|
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
|
|
Signed-off-by: Xiaodong Li <lixiaodong67@huawei.com>
|
|
|
|
Conflicts:
|
|
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
|
|
---
|
|
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 2 +-
|
|
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
|
|
index 4e936d7933f7..fd2debdb517c 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
|
|
@@ -723,7 +723,7 @@ static void
|
|
hns3_dbg_dev_caps(struct hnae3_handle *h, char *buf, int len, int *pos)
|
|
{
|
|
struct hnae3_ae_dev *ae_dev = pci_get_drvdata(h->pdev);
|
|
- static const char * const str[] = {"no", "yes"};
|
|
+ const char * const str[] = {"no", "yes"};
|
|
unsigned long *caps = ae_dev->caps;
|
|
u32 i, state;
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c
|
|
index 6e5d549f0adf..0356af21ff44 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c
|
|
@@ -72,7 +72,7 @@ static bool hclgevf_cmd_csq_done(struct hclgevf_hw *hw)
|
|
|
|
static bool hclgevf_is_special_opcode(u16 opcode)
|
|
{
|
|
- static const u16 spec_opcode[] = {0x30, 0x31, 0x32};
|
|
+ const u16 spec_opcode[] = {0x30, 0x31, 0x32};
|
|
int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(spec_opcode); i++) {
|
|
--
|
|
2.34.1
|
|
|