* [PATCH net-next 1/2] net: hns3: fix hns3 driver header file not self-contained issue
2022-11-12 8:17 [PATCH net-next 0/2] net: hns3: Cleanup for static warnings Hao Lan
@ 2022-11-12 8:17 ` Hao Lan
2022-11-12 8:17 ` [PATCH net-next 2/2] net: hns3: add complete parentheses for some macros Hao Lan
2022-11-15 2:59 ` [PATCH net-next 0/2] net: hns3: Cleanup for static warnings Jakub Kicinski
2 siblings, 0 replies; 5+ messages in thread
From: Hao Lan @ 2022-11-12 8:17 UTC (permalink / raw)
To: lanhao, lipeng321, shenjian15, linyunsheng, liuyonglong,
chenhao418, wangjie125, huangguangbin2, yisen.zhuang, salil.mehta,
davem, edumazet, kuba, pabeni, netdev, xiaojiantao1
From: Hao Chen <chenhao418@huawei.com>
The hns3 driver header file uses the structure of other files, but does
not include corresponding file, which causes a check warning that the
header file is not self-contained.
Therefore, the required header file is included in the header file, and
the structure declaration is added to the header file to avoid cyclic
dependency of the header file.
Signed-off-by: Hao Chen <chenhao418@huawei.com>
Signed-off-by: Hao Lan <lanhao@huawei.com>
---
drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 4 +++-
.../hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.h | 2 ++
drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 3 +++
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.h | 5 ++++-
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h b/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h
index abcd7877f7d2..487216aeae50 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h
@@ -7,6 +7,8 @@
#include <linux/mutex.h>
#include <linux/types.h>
+struct hclgevf_dev;
+
enum HCLGE_MBX_OPCODE {
HCLGE_MBX_RESET = 0x01, /* (VF -> PF) assert reset */
HCLGE_MBX_ASSERTING_RESET, /* (PF -> VF) PF is asserting reset */
@@ -233,7 +235,7 @@ struct hclgevf_mbx_arq_ring {
__le16 msg_q[HCLGE_MBX_MAX_ARQ_MSG_NUM][HCLGE_MBX_MAX_ARQ_MSG_SIZE];
};
-struct hclge_dev;
+struct hclge_vport;
#define HCLGE_MBX_OPCODE_MAX 256
struct hclge_mbx_ops_param {
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.h b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.h
index a46350162ee8..7aff1a544cf4 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.h
@@ -7,6 +7,8 @@
#include <linux/etherdevice.h>
#include "hnae3.h"
+struct hclge_comm_hw;
+
/* each tqp has TX & RX two queues */
#define HCLGE_COMM_QUEUE_PAIR_SIZE 2
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
index 133a054af6b7..557a5fa70d0a 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
@@ -13,6 +13,9 @@
struct iphdr;
struct ipv6hdr;
+struct gre_base_hdr;
+struct tcphdr;
+struct udphdr;
enum hns3_nic_state {
HNS3_NIC_STATE_TESTING,
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.h
index bbee74cd8404..bceb61c791a1 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.h
@@ -8,8 +8,11 @@
#include <linux/net_tstamp.h>
#include <linux/types.h>
-struct hclge_dev;
struct ifreq;
+struct ethtool_ts_info;
+
+struct hnae3_handle;
+struct hclge_dev;
#define HCLGE_PTP_REG_OFFSET 0x29000
--
2.30.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH net-next 2/2] net: hns3: add complete parentheses for some macros
2022-11-12 8:17 [PATCH net-next 0/2] net: hns3: Cleanup for static warnings Hao Lan
2022-11-12 8:17 ` [PATCH net-next 1/2] net: hns3: fix hns3 driver header file not self-contained issue Hao Lan
@ 2022-11-12 8:17 ` Hao Lan
2022-11-15 2:59 ` [PATCH net-next 0/2] net: hns3: Cleanup for static warnings Jakub Kicinski
2 siblings, 0 replies; 5+ messages in thread
From: Hao Lan @ 2022-11-12 8:17 UTC (permalink / raw)
To: lanhao, lipeng321, shenjian15, linyunsheng, liuyonglong,
chenhao418, wangjie125, huangguangbin2, yisen.zhuang, salil.mehta,
davem, edumazet, kuba, pabeni, netdev, xiaojiantao1
From: Jiantao Xiao <xiaojiantao1@h-partners.com>
Add complete parentheses for some macros to fix static check
warning.
Signed-off-by: Jiantao Xiao <xiaojiantao1@h-partners.com>
Signed-off-by: Hao Lan <lanhao@huawei.com>
---
drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
index 557a5fa70d0a..7df4cf656d22 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
@@ -692,7 +692,7 @@ static inline unsigned int hns3_page_order(struct hns3_enet_ring *ring)
/* iterator for handling rings in ring group */
#define hns3_for_each_ring(pos, head) \
- for (pos = (head).ring; (pos); pos = (pos)->next)
+ for ((pos) = (head).ring; (pos); (pos) = (pos)->next)
#define hns3_get_handle(ndev) \
(((struct hns3_nic_priv *)netdev_priv(ndev))->ae_handle)
--
2.30.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net-next 0/2] net: hns3: Cleanup for static warnings.
2022-11-12 8:17 [PATCH net-next 0/2] net: hns3: Cleanup for static warnings Hao Lan
2022-11-12 8:17 ` [PATCH net-next 1/2] net: hns3: fix hns3 driver header file not self-contained issue Hao Lan
2022-11-12 8:17 ` [PATCH net-next 2/2] net: hns3: add complete parentheses for some macros Hao Lan
@ 2022-11-15 2:59 ` Jakub Kicinski
2022-11-15 13:29 ` Hao Lan
2 siblings, 1 reply; 5+ messages in thread
From: Jakub Kicinski @ 2022-11-15 2:59 UTC (permalink / raw)
To: Hao Lan
Cc: lipeng321, shenjian15, linyunsheng, liuyonglong, chenhao418,
wangjie125, huangguangbin2, yisen.zhuang, salil.mehta, davem,
edumazet, pabeni, netdev, xiaojiantao1
On Sat, 12 Nov 2022 16:17:47 +0800 Hao Lan wrote:
> Most static warnings are mainly about:
> Patch #1: fix hns3 driver header file not self-contained issue.
> Patch #2: add complete parentheses for some macros.
You need to say what static checker was used.
I think it's documented in the "researcher guidelines" doc.
In case patch 2 was based on a warning from checkpatch please
drop it from the series, we don't take checkpatch-based cleanups.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next 0/2] net: hns3: Cleanup for static warnings.
2022-11-15 2:59 ` [PATCH net-next 0/2] net: hns3: Cleanup for static warnings Jakub Kicinski
@ 2022-11-15 13:29 ` Hao Lan
0 siblings, 0 replies; 5+ messages in thread
From: Hao Lan @ 2022-11-15 13:29 UTC (permalink / raw)
To: Jakub Kicinski; +Cc: davem, edumazet, pabeni, netdev
Thanks, we will send another patch.
On 2022/11/15 10:59, Jakub Kicinski wrote:
> On Sat, 12 Nov 2022 16:17:47 +0800 Hao Lan wrote:
>> Most static warnings are mainly about:
>> Patch #1: fix hns3 driver header file not self-contained issue.
>> Patch #2: add complete parentheses for some macros.
>
> You need to say what static checker was used.
> I think it's documented in the "researcher guidelines" doc.
> In case patch 2 was based on a warning from checkpatch please
> drop it from the series, we don't take checkpatch-based cleanups.
> .
>
^ permalink raw reply [flat|nested] 5+ messages in thread