From a172993cb9084795a0cc8abdacf6e06574f88922 Mon Sep 17 00:00:00 2001
From: veega2022 <zhuweijia@huawei.com>
Date: Wed, 28 Aug 2024 11:44:18 +0800
Subject: [PATCH 20/27] hikptool: Modify the macro definition of the header
 file

Modify the macro definition of the header file and
delete the underscores at the beginning.

Signed-off-by: veega2022 <zhuweijia@huawei.com>
---
 cxl/func_lib/cxl_func/cxl_feature.h             | 6 +++---
 cxl/usr_cmd/cmd_analysis/cxl_tool_include.h     | 6 +++---
 libhikptdev/src/rciep/hikpt_rciep.h             | 6 +++---
 net/hikp_net_lib.h                              | 6 +++---
 net/nic/nic_dfx/hikp_nic_dfx.h                  | 6 +++---
 net/nic/nic_info/hikp_nic_info.h                | 6 +++---
 net/nic/nic_log/hikp_nic_log.h                  | 6 +++---
 net/nic/nic_mac/hikp_mac_cmd.h                  | 2 +-
 net/nic/nic_mac/hikp_nic_mac_dump.h             | 2 +-
 net/nic/nic_mac/hikp_nic_port.h                 | 2 +-
 net/nic/nic_mac/hikp_nic_xsfp.h                 | 2 +-
 net/nic/nic_qos/hikp_nic_qos.c                  | 3 +--
 net/roce/roce_bond/hikp_roce_bond.h             | 6 +++---
 net/roce/roce_caep/hikp_roce_caep.h             | 6 +++---
 net/roce/roce_ext_common/hikp_roce_ext_common.h | 6 +++---
 net/roce/roce_global_cfg/hikp_roce_global_cfg.h | 6 +++---
 net/roce/roce_gmv/hikp_roce_gmv.h               | 6 +++---
 net/roce/roce_mdb/hikp_roce_mdb.h               | 6 +++---
 net/roce/roce_pkt/hikp_roce_pkt.h               | 6 +++---
 net/roce/roce_qmm/hikp_roce_qmm.h               | 6 +++---
 net/roce/roce_rst/hikp_roce_rst.h               | 6 +++---
 net/roce/roce_scc/hikp_roce_scc.h               | 6 +++---
 net/roce/roce_timer/hikp_roce_timer.h           | 6 +++---
 net/roce/roce_trp/hikp_roce_trp.h               | 6 +++---
 net/roce/roce_tsp/hikp_roce_tsp.h               | 6 +++---
 net/roh/hikp_roh_cmd.h                          | 6 +++---
 net/roh/hikp_roh_mac.h                          | 6 +++---
 net/roh/hikp_roh_show_bp.h                      | 6 +++---
 net/roh/hikp_roh_show_mib.h                     | 6 +++---
 ossl/ossl_user_linux.h                          | 2 +-
 pcie/func_lib/osal/os_common.h                  | 6 +++---
 pcie/func_lib/pcie_func/pcie_common.h           | 6 +++---
 pcie/func_lib/pcie_func/pcie_link_ltssm.h       | 6 +++---
 pcie/func_lib/pcie_func/pcie_reg_dump.h         | 6 +++---
 pcie/func_lib/pcie_func/pcie_reg_read.h         | 6 +++---
 pcie/func_lib/pcie_func/pcie_statistics.h       | 6 +++---
 pcie/usr_cmd/cmd_analysis/pcie_tools_include.h  | 6 +++---
 pcie/usr_cmd/interface/pcie_common_api.h        | 6 +++---
 sas/sas_func/sas_analy_queue.h                  | 6 +++---
 sas/sas_func/sas_common.h                       | 6 +++---
 sas/sas_func/sas_dump_reg.h                     | 6 +++---
 sas/sas_func/sas_read_dev.h                     | 6 +++---
 sas/sas_func/sas_read_dqe.h                     | 6 +++---
 sas/sas_func/sas_read_errcode.h                 | 6 +++---
 sas/user_cmd/cmd_code/sas_tools_include.h       | 6 +++---
 sata/sata_func/sata_common.h                    | 6 +++---
 sata/sata_func/sata_dump_reg.h                  | 6 +++---
 sata/user_cmd/cmd_code/sata_tools_include.h     | 6 +++---
 serdes/hikp_serdes.h                            | 8 +++-----
 socip/hikp_socip.h                              | 6 +++---
 tool_lib/tool_cmd.h                             | 2 +-
 tool_lib/tool_lib.h                             | 6 +++---
 52 files changed, 142 insertions(+), 145 deletions(-)

diff --git a/cxl/func_lib/cxl_func/cxl_feature.h b/cxl/func_lib/cxl_func/cxl_feature.h
index 3ac6f75..339ccee 100644
--- a/cxl/func_lib/cxl_func/cxl_feature.h
+++ b/cxl/func_lib/cxl_func/cxl_feature.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __CXL_FEATURE_H_
-#define __CXL_FEATURE_H_
+#ifndef CXL_FEATURE_H
+#define CXL_FEATURE_H
 
 #include "tool_cmd.h"
 
@@ -408,4 +408,4 @@ union cxl_mem_error_ctrl {
 	uint32_t val;
 };
 
-#endif
+#endif /* CXL_FEATURE_H */
diff --git a/cxl/usr_cmd/cmd_analysis/cxl_tool_include.h b/cxl/usr_cmd/cmd_analysis/cxl_tool_include.h
index 5028056..6ba0f0d 100644
--- a/cxl/usr_cmd/cmd_analysis/cxl_tool_include.h
+++ b/cxl/usr_cmd/cmd_analysis/cxl_tool_include.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __CXL_TOOL_INCLUDE_H_
-#define __CXL_TOOL_INCLUDE_H_
+#ifndef CXL_TOOL_INCLUDE_H
+#define CXL_TOOL_INCLUDE_H
 
 #include <stdint.h>
 
@@ -21,4 +21,4 @@ struct tool_cxl_cmd {
 	uint32_t port_id;
 };
 
-#endif
+#endif /* CXL_TOOL_INCLUDE_H */
diff --git a/libhikptdev/src/rciep/hikpt_rciep.h b/libhikptdev/src/rciep/hikpt_rciep.h
index c64e4dd..bf2a2d7 100644
--- a/libhikptdev/src/rciep/hikpt_rciep.h
+++ b/libhikptdev/src/rciep/hikpt_rciep.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __KPT_RCIEP_H__
-#define __KPT_RCIEP_H__
+#ifndef KPT_RCIEP_H
+#define KPT_RCIEP_H
 
 #include <stdint.h>
 #include "hikptdev_plug.h"
@@ -104,4 +104,4 @@ union hikp_space_req {
 };
 #pragma pack()
 
-#endif
+#endif /* KPT_RCIEP_H */
diff --git a/net/hikp_net_lib.h b/net/hikp_net_lib.h
index 8a0958f..7ebabfa 100644
--- a/net/hikp_net_lib.h
+++ b/net/hikp_net_lib.h
@@ -10,8 +10,8 @@
  *
  * See the Mulan PSL v2 for more details.
  */
-#ifndef __HIKP_NET_LIB_H__
-#define __HIKP_NET_LIB_H__
+#ifndef HIKP_NET_LIB_H
+#define HIKP_NET_LIB_H
 
 #include "ossl_user_linux.h"
 #include "tool_cmd.h"
@@ -138,4 +138,4 @@ int get_vf_dev_info_by_pf_dev_name(const char *pf_dev_name,
 int get_pf_dev_info_by_vf_dev_name(const char *vf_dev_name, struct tool_target *pf_target);
 void hikp_ether_format_addr(char *buf, uint16_t size, const uint8_t *mac_addr, uint8_t mac_len);
 
-#endif
+#endif /* HIKP_NET_LIB_H */
diff --git a/net/nic/nic_dfx/hikp_nic_dfx.h b/net/nic/nic_dfx/hikp_nic_dfx.h
index 3f23b59..d46d290 100644
--- a/net/nic/nic_dfx/hikp_nic_dfx.h
+++ b/net/nic/nic_dfx/hikp_nic_dfx.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __HIKP_NIC_DFX_H__
-#define __HIKP_NIC_DFX_H__
+#ifndef HIKP_NIC_DFX_H
+#define HIKP_NIC_DFX_H
 
 #include "hikp_net_lib.h"
 
@@ -138,4 +138,4 @@ struct nic_dfx_rsp_t {
 	uint32_t reg_data[MAX_DFX_DATA_NUM];
 };
 
-#endif
+#endif /* HIKP_NIC_DFX_H */
diff --git a/net/nic/nic_info/hikp_nic_info.h b/net/nic/nic_info/hikp_nic_info.h
index 194146e..b1dd7dc 100644
--- a/net/nic/nic_info/hikp_nic_info.h
+++ b/net/nic/nic_info/hikp_nic_info.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __HIKP_NIC_INFO_H__
-#define __HIKP_NIC_INFO_H__
+#ifndef HIKP_NIC_INFO_H
+#define HIKP_NIC_INFO_H
 
 #include "hikp_net_lib.h"
 
@@ -77,4 +77,4 @@ enum nic_info_mac_type {
 	MAC_TYPE_MAX,
 };
 
-#endif
+#endif /* HIKP_NIC_INFO_H */
diff --git a/net/nic/nic_log/hikp_nic_log.h b/net/nic/nic_log/hikp_nic_log.h
index ff2bb87..2998464 100644
--- a/net/nic/nic_log/hikp_nic_log.h
+++ b/net/nic/nic_log/hikp_nic_log.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __HIKP_NIC_LOG_H__
-#define __HIKP_NIC_LOG_H__
+#ifndef HIKP_NIC_LOG_H
+#define HIKP_NIC_LOG_H
 
 #include "hikp_net_lib.h"
 
@@ -38,4 +38,4 @@ struct log_param {
 	struct tool_target target;
 };
 
-#endif
+#endif /* HIKP_NIC_LOG_H */
diff --git a/net/nic/nic_mac/hikp_mac_cmd.h b/net/nic/nic_mac/hikp_mac_cmd.h
index 9a3f0d9..0cd209f 100644
--- a/net/nic/nic_mac/hikp_mac_cmd.h
+++ b/net/nic/nic_mac/hikp_mac_cmd.h
@@ -62,4 +62,4 @@ enum mac_dump_xsfp_sub_cmd {
 	NIC_XSFP_GET_EEPROM_DATA,
 };
 
-#endif
+#endif /* HIKP_MAC_CMD_H */
diff --git a/net/nic/nic_mac/hikp_nic_mac_dump.h b/net/nic/nic_mac/hikp_nic_mac_dump.h
index f82762e..0c58ad5 100644
--- a/net/nic/nic_mac/hikp_nic_mac_dump.h
+++ b/net/nic/nic_mac/hikp_nic_mac_dump.h
@@ -60,4 +60,4 @@ struct cmd_mac_dump {
 	uint32_t blk_num[MOD_ID_MAX];
 	const char *module_name;
 };
-#endif
+#endif /* HIKP_NIC_MAC_DUMP_H */
diff --git a/net/nic/nic_mac/hikp_nic_port.h b/net/nic/nic_mac/hikp_nic_port.h
index cb72ebc..69ebb53 100644
--- a/net/nic/nic_mac/hikp_nic_port.h
+++ b/net/nic/nic_mac/hikp_nic_port.h
@@ -271,4 +271,4 @@ struct cmd_hot_plug_card_info {
 	uint8_t cur_type;
 };
 
-#endif
+#endif /* HIKP_NIC_PORT_H */
diff --git a/net/nic/nic_mac/hikp_nic_xsfp.h b/net/nic/nic_mac/hikp_nic_xsfp.h
index a04ecdc..50cbb2d 100644
--- a/net/nic/nic_mac/hikp_nic_xsfp.h
+++ b/net/nic/nic_mac/hikp_nic_xsfp.h
@@ -549,4 +549,4 @@ struct hikp_xsfp_ctrl {
 	uint32_t dump_param;
 };
 
-#endif
+#endif /* HIKP_NIC_XSFP_H */
diff --git a/net/nic/nic_qos/hikp_nic_qos.c b/net/nic/nic_qos/hikp_nic_qos.c
index 9e997e4..2de0972 100644
--- a/net/nic/nic_qos/hikp_nic_qos.c
+++ b/net/nic/nic_qos/hikp_nic_qos.c
@@ -15,9 +15,8 @@
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
-
-#include "hikp_nic_qos.h"
 #include "hikpt_rciep.h"
+#include "hikp_nic_qos.h"
 
 static struct nic_qos_param g_qos_param = { 0 };
 
diff --git a/net/roce/roce_bond/hikp_roce_bond.h b/net/roce/roce_bond/hikp_roce_bond.h
index 14bd233..5e18723 100644
--- a/net/roce/roce_bond/hikp_roce_bond.h
+++ b/net/roce/roce_bond/hikp_roce_bond.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __HIKP_ROCE_BOND_H__
-#define __HIKP_ROCE_BOND_H__
+#ifndef HIKP_ROCE_BOND_H
+#define HIKP_ROCE_BOND_H
 
 #include "hikp_roce_ext_common.h"
 
@@ -26,4 +26,4 @@ struct roce_bond_req_param {
 	uint32_t block_id;
 };
 
-#endif /* __HIKP_ROCE_BOND_H__ */
+#endif /* HIKP_ROCE_BOND_H */
diff --git a/net/roce/roce_caep/hikp_roce_caep.h b/net/roce/roce_caep/hikp_roce_caep.h
index 547a4d6..becb332 100644
--- a/net/roce/roce_caep/hikp_roce_caep.h
+++ b/net/roce/roce_caep/hikp_roce_caep.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __HIKP_ROCE_CAEP_H__
-#define __HIKP_ROCE_CAEP_H__
+#ifndef HIKP_ROCE_CAEP_H
+#define HIKP_ROCE_CAEP_H
 
 #include "hikp_roce_ext_common.h"
 
@@ -48,4 +48,4 @@ enum roce_caep_cmd_type {
 	CAEP_EXT,
 };
 
-#endif /* __HIKP_ROCE_CAEP_H__ */
+#endif /* HIKP_ROCE_CAEP_H */
diff --git a/net/roce/roce_ext_common/hikp_roce_ext_common.h b/net/roce/roce_ext_common/hikp_roce_ext_common.h
index 4930bed..8568556 100644
--- a/net/roce/roce_ext_common/hikp_roce_ext_common.h
+++ b/net/roce/roce_ext_common/hikp_roce_ext_common.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __HIKP_ROCE_EXT_COMMON_H__
-#define __HIKP_ROCE_EXT_COMMON_H__
+#ifndef HIKP_ROCE_EXT_COMMON_H
+#define HIKP_ROCE_EXT_COMMON_H
 
 #include "hikp_net_lib.h"
 
@@ -64,4 +64,4 @@ void hikp_roce_ext_execute(struct major_cmd_ctrl *self,
 					   uint32_t block_id,
 					   struct roce_ext_reg_name *reg_name));
 
-#endif /* __HIKP_ROCE_EXT_COMMON_H__ */
+#endif /* HIKP_ROCE_EXT_COMMON_H */
diff --git a/net/roce/roce_global_cfg/hikp_roce_global_cfg.h b/net/roce/roce_global_cfg/hikp_roce_global_cfg.h
index 66e7fb8..aa1db92 100644
--- a/net/roce/roce_global_cfg/hikp_roce_global_cfg.h
+++ b/net/roce/roce_global_cfg/hikp_roce_global_cfg.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __HIKP_ROCE_GLOBAL_CFG_H__
-#define __HIKP_ROCE_GLOBAL_CFG_H__
+#ifndef HIKP_ROCE_GLOBAL_CFG_H
+#define HIKP_ROCE_GLOBAL_CFG_H
 
 #include "hikp_roce_ext_common.h"
 
@@ -37,4 +37,4 @@ enum roce_global_cfg_cmd_type {
 	ROCE_GLB_NICL,
 };
 
-#endif /* __HIKP_ROCE_GLOBAL_CFG_H__ */
+#endif /* HIKP_ROCE_GLOBAL_CFG_H */
diff --git a/net/roce/roce_gmv/hikp_roce_gmv.h b/net/roce/roce_gmv/hikp_roce_gmv.h
index a02b960..8bc49d0 100644
--- a/net/roce/roce_gmv/hikp_roce_gmv.h
+++ b/net/roce/roce_gmv/hikp_roce_gmv.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __HIKP_ROCE_GMV_H__
-#define __HIKP_ROCE_GMV_H__
+#ifndef HIKP_ROCE_GMV_H
+#define HIKP_ROCE_GMV_H
 
 #include "hikp_roce_ext_common.h"
 
@@ -38,4 +38,4 @@ enum roce_gmv_cmd_type {
 	GMV_SHOW = 0x0,
 };
 
-#endif /* __HIKP_ROCE_GMV_H__ */
+#endif /* HIKP_ROCE_GMV_H */
diff --git a/net/roce/roce_mdb/hikp_roce_mdb.h b/net/roce/roce_mdb/hikp_roce_mdb.h
index 26fc549..e8dfcca 100644
--- a/net/roce/roce_mdb/hikp_roce_mdb.h
+++ b/net/roce/roce_mdb/hikp_roce_mdb.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __HIKP_ROCE_MDB_H__
-#define __HIKP_ROCE_MDB_H__
+#ifndef HIKP_ROCE_MDB_H
+#define HIKP_ROCE_MDB_H
 
 #include "hikp_roce_ext_common.h"
 
@@ -49,4 +49,4 @@ enum roce_mdb_cmd_type {
 	MDB_CLEAR_EXT,
 };
 
-#endif /* __HIKP_ROCE_MDB_H__ */
+#endif /* HIKP_ROCE_MDB_H */
diff --git a/net/roce/roce_pkt/hikp_roce_pkt.h b/net/roce/roce_pkt/hikp_roce_pkt.h
index 0200c44..05d464e 100644
--- a/net/roce/roce_pkt/hikp_roce_pkt.h
+++ b/net/roce/roce_pkt/hikp_roce_pkt.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __HIKP_ROCE_PKT_H__
-#define __HIKP_ROCE_PKT_H__
+#ifndef HIKP_ROCE_PKT_H
+#define HIKP_ROCE_PKT_H
 
 #include "hikp_roce_ext_common.h"
 
@@ -39,4 +39,4 @@ struct roce_pkt_res_param {
 	struct roce_pkt_res reg_data;
 };
 
-#endif /* __HIKP_ROCE_PKT_H__ */
+#endif /* HIKP_ROCE_PKT_H */
diff --git a/net/roce/roce_qmm/hikp_roce_qmm.h b/net/roce/roce_qmm/hikp_roce_qmm.h
index 06e6bcf..eb7722b 100644
--- a/net/roce/roce_qmm/hikp_roce_qmm.h
+++ b/net/roce/roce_qmm/hikp_roce_qmm.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __HIKP_ROCE_QMM_H__
-#define __HIKP_ROCE_QMM_H__
+#ifndef HIKP_ROCE_QMM_H
+#define HIKP_ROCE_QMM_H
 
 #include "hikp_roce_ext_common.h"
 
@@ -51,4 +51,4 @@ enum roce_qmm_cmd_type {
 	QMM_SHOW_TOP_EXT,
 };
 
-#endif /* __HIKP_ROCE_QMM_H__ */
+#endif /* HIKP_ROCE_QMM_H */
diff --git a/net/roce/roce_rst/hikp_roce_rst.h b/net/roce/roce_rst/hikp_roce_rst.h
index 731effc..e864b68 100644
--- a/net/roce/roce_rst/hikp_roce_rst.h
+++ b/net/roce/roce_rst/hikp_roce_rst.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __HIKP_ROCE_RST_H__
-#define __HIKP_ROCE_RST_H__
+#ifndef HIKP_ROCE_RST_H
+#define HIKP_ROCE_RST_H
 
 #include "hikp_roce_ext_common.h"
 
@@ -26,4 +26,4 @@ struct roce_rst_req_param {
 	uint32_t block_id;
 };
 
-#endif /* __HIKP_ROCE_RST_H__ */
+#endif /* HIKP_ROCE_RST_H */
diff --git a/net/roce/roce_scc/hikp_roce_scc.h b/net/roce/roce_scc/hikp_roce_scc.h
index 5d37a11..9b5c0c5 100644
--- a/net/roce/roce_scc/hikp_roce_scc.h
+++ b/net/roce/roce_scc/hikp_roce_scc.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __HIKP_ROCE_SCC_H__
-#define __HIKP_ROCE_SCC_H__
+#ifndef HIKP_ROCE_SCC_H
+#define HIKP_ROCE_SCC_H
 
 #include "hikp_roce_ext_common.h"
 
@@ -66,4 +66,4 @@ enum roce_scc_type {
 	CFG,
 };
 
-#endif /* __HIKP_ROCE_SCC_H__ */
+#endif /* HIKP_ROCE_SCC_H */
diff --git a/net/roce/roce_timer/hikp_roce_timer.h b/net/roce/roce_timer/hikp_roce_timer.h
index 7f7deb6..314547e 100644
--- a/net/roce/roce_timer/hikp_roce_timer.h
+++ b/net/roce/roce_timer/hikp_roce_timer.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __HIKP_ROCE_TIMER_H__
-#define __HIKP_ROCE_TIMER_H__
+#ifndef HIKP_ROCE_TIMER_H
+#define HIKP_ROCE_TIMER_H
 
 #include "hikp_roce_ext_common.h"
 
@@ -40,4 +40,4 @@ struct roce_timer_rsp_data {
 	uint32_t timer_content[ROCE_HIKP_TIMER_REG_NUM][2];
 };
 
-#endif /* __HIKP_ROCE_TIMER_H__ */
+#endif /* HIKP_ROCE_TIMER_H */
diff --git a/net/roce/roce_trp/hikp_roce_trp.h b/net/roce/roce_trp/hikp_roce_trp.h
index 97f1838..212d36f 100644
--- a/net/roce/roce_trp/hikp_roce_trp.h
+++ b/net/roce/roce_trp/hikp_roce_trp.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __HIKP_ROCE_TRP_H__
-#define __HIKP_ROCE_TRP_H__
+#ifndef HIKP_ROCE_TRP_H
+#define HIKP_ROCE_TRP_H
 
 #include "hikp_roce_ext_common.h"
 
@@ -70,4 +70,4 @@ enum roce_trp_type {
 	COMMON,
 };
 
-#endif /* __HIKP_ROCE_TRP_H__ */
+#endif /* HIKP_ROCE_TRP_H */
diff --git a/net/roce/roce_tsp/hikp_roce_tsp.h b/net/roce/roce_tsp/hikp_roce_tsp.h
index 43d0d0d..a35f869 100644
--- a/net/roce/roce_tsp/hikp_roce_tsp.h
+++ b/net/roce/roce_tsp/hikp_roce_tsp.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __HIKP_ROCE_TSP_H__
-#define __HIKP_ROCE_TSP_H__
+#ifndef HIKP_ROCE_TSP_H
+#define HIKP_ROCE_TSP_H
 
 #include "hikp_roce_ext_common.h"
 
@@ -61,4 +61,4 @@ enum roce_tsp_sub_cmd_code {
 	TGP_TMP,
 };
 
-#endif /* __HIKP_ROCE_TSP_H__ */
+#endif /* HIKP_ROCE_TSP_H */
diff --git a/net/roh/hikp_roh_cmd.h b/net/roh/hikp_roh_cmd.h
index 5aea6ac..1fb19d0 100644
--- a/net/roh/hikp_roh_cmd.h
+++ b/net/roh/hikp_roh_cmd.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __HIKP_ROH_CMD_H__
-#define __HIKP_ROH_CMD_H__
+#ifndef HIKP_ROH_CMD_H
+#define HIKP_ROH_CMD_H
 
 #include "hikp_net_lib.h"
 
@@ -35,4 +35,4 @@ enum roh_show_bp_subcmd {
 };
 
 int hikp_roh_get_mac_type(struct major_cmd_ctrl *self, struct bdf_t bdf);
-#endif /* __HIKP_ROH_CMD_H__ */
+#endif /* HIKP_ROH_CMD_H */
diff --git a/net/roh/hikp_roh_mac.h b/net/roh/hikp_roh_mac.h
index 88115cf..c9037f0 100644
--- a/net/roh/hikp_roh_mac.h
+++ b/net/roh/hikp_roh_mac.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __HIKP_ROH_MAC_H__
-#define __HIKP_ROH_MAC_H__
+#ifndef HIKP_ROH_MAC_H
+#define HIKP_ROH_MAC_H
 
 #include "tool_lib.h"
 #include "hikp_net_lib.h"
@@ -104,4 +104,4 @@ struct roh_mac_credit_data {
 	uint32_t cut_reg_value[MAX_CRD_SIZE];
 };
 
-#endif /* __HIKP_ROH_MAC_H__ */
+#endif /* HIKP_ROH_MAC_H */
diff --git a/net/roh/hikp_roh_show_bp.h b/net/roh/hikp_roh_show_bp.h
index e7a3894..411bd23 100644
--- a/net/roh/hikp_roh_show_bp.h
+++ b/net/roh/hikp_roh_show_bp.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __HIKP_ROH_SHOW_BP_H__
-#define __HIKP_ROH_SHOW_BP_H__
+#ifndef HIKP_ROH_SHOW_BP_H
+#define HIKP_ROH_SHOW_BP_H
 
 #include "hikp_net_lib.h"
 
@@ -47,4 +47,4 @@ struct roh_show_bp_rsp_t {
 #define VERIFY_MAC_ID 2
 #define BP_SIZE 8
 
-#endif /* __HIKP_ROH_SHOW_BP_H__ */
+#endif /* HIKP_ROH_SHOW_BP_H */
diff --git a/net/roh/hikp_roh_show_mib.h b/net/roh/hikp_roh_show_mib.h
index fc7c308..f8c4855 100644
--- a/net/roh/hikp_roh_show_mib.h
+++ b/net/roh/hikp_roh_show_mib.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __HIKP_ROH_SHOW_MIB_H__
-#define __HIKP_ROH_SHOW_MIB_H__
+#ifndef HIKP_ROH_SHOW_MIB_H
+#define HIKP_ROH_SHOW_MIB_H
 
 #include "hikp_net_lib.h"
 
@@ -83,4 +83,4 @@ enum target_addr {
 #define ROH_CMD_SHOW_MIB (1 << 0)
 #define RESPONSE_MIB_NUMBER_MAX 15
 
-#endif /* __HIKP_ROH_SHOW_MIB_H__ */
+#endif /* HIKP_ROH_SHOW_MIB_H */
diff --git a/ossl/ossl_user_linux.h b/ossl/ossl_user_linux.h
index 16fc2d2..c2173e2 100644
--- a/ossl/ossl_user_linux.h
+++ b/ossl/ossl_user_linux.h
@@ -69,4 +69,4 @@ int uda_unfcntl(const int *fd, const uint32_t operation);
 
 extern void record_syslog(const char *ident, const int priority, const char *logs);
 
-#endif
+#endif /* OSSL_USER_LINUX_H */
diff --git a/pcie/func_lib/osal/os_common.h b/pcie/func_lib/osal/os_common.h
index de2a517..45ae343 100644
--- a/pcie/func_lib/osal/os_common.h
+++ b/pcie/func_lib/osal/os_common.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef _OS_COMMON_H_
-#define _OS_COMMON_H_
+#ifndef OS_COMMON_H
+#define OS_COMMON_H
 
 #define LOG_PCIE "[PCIE]"
 
@@ -26,4 +26,4 @@
 
 #define Tips(x, args...) Info("[ TIPS ] " x, ##args)
 
-#endif
+#endif /* OS_COMMON_H */
diff --git a/pcie/func_lib/pcie_func/pcie_common.h b/pcie/func_lib/pcie_func/pcie_common.h
index 98d9e25..1a5ab3a 100644
--- a/pcie/func_lib/pcie_func/pcie_common.h
+++ b/pcie/func_lib/pcie_func/pcie_common.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __PCIE_COMMON_H_
-#define __PCIE_COMMON_H_
+#ifndef PCIE_COMMON_H
+#define PCIE_COMMON_H
 
 /* PCIe command code */
 enum pcie_cmd_type {
@@ -48,4 +48,4 @@ enum pcie_reg_read_cmd_type {
 	REGRD_READ = 1,
 };
 
-#endif
+#endif /* PCIE_COMMON_H */
diff --git a/pcie/func_lib/pcie_func/pcie_link_ltssm.h b/pcie/func_lib/pcie_func/pcie_link_ltssm.h
index cc51501..9986f7a 100644
--- a/pcie/func_lib/pcie_func/pcie_link_ltssm.h
+++ b/pcie/func_lib/pcie_func/pcie_link_ltssm.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __PCIE_LINK_LTSSM_H_
-#define __PCIE_LINK_LTSSM_H_
+#ifndef PCIE_LINK_LTSSM_H
+#define PCIE_LINK_LTSSM_H
 
 #include "pcie_common_api.h"
 
@@ -60,4 +60,4 @@ int pcie_ltssm_trace_mode_set(uint32_t port_id, uint32_t mode);
 int pcie_ltssm_link_status_get(uint32_t port_id);
 int pcie_pm_trace(uint32_t port_id);
 
-#endif
+#endif /* PCIE_LINK_LTSSM_H */
diff --git a/pcie/func_lib/pcie_func/pcie_reg_dump.h b/pcie/func_lib/pcie_func/pcie_reg_dump.h
index cbea2f6..aaf22ba 100644
--- a/pcie/func_lib/pcie_func/pcie_reg_dump.h
+++ b/pcie/func_lib/pcie_func/pcie_reg_dump.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __PCIE_REG_DUMP_H_
-#define __PCIE_REG_DUMP_H_
+#ifndef PCIE_REG_DUMP_H
+#define PCIE_REG_DUMP_H
 
 #include "pcie_common_api.h"
 
@@ -56,4 +56,4 @@ struct pcie_dumpreg_table {
 
 int pcie_dumpreg_do_dump(uint32_t port_id, uint32_t dump_level);
 
-#endif
+#endif /* PCIE_REG_DUMP_H */
diff --git a/pcie/func_lib/pcie_func/pcie_reg_read.h b/pcie/func_lib/pcie_func/pcie_reg_read.h
index 05d509a..ec01083 100644
--- a/pcie/func_lib/pcie_func/pcie_reg_read.h
+++ b/pcie/func_lib/pcie_func/pcie_reg_read.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __PCIE_REG_READ_H_
-#define __PCIE_REG_READ_H_
+#ifndef PCIE_REG_READ_H
+#define PCIE_REG_READ_H
 
 #include "pcie_common_api.h"
 
@@ -57,4 +57,4 @@ enum pcie_module_id_list {
 int pcie_reg_read(uint32_t port_id, uint32_t module_id, uint32_t offset);
 int pcie_read_name2module_id(const char *module_name, uint32_t *module_id);
 
-#endif
+#endif /* PCIE_REG_READ_H */
diff --git a/pcie/func_lib/pcie_func/pcie_statistics.h b/pcie/func_lib/pcie_func/pcie_statistics.h
index 3e3916b..c373573 100644
--- a/pcie/func_lib/pcie_func/pcie_statistics.h
+++ b/pcie/func_lib/pcie_func/pcie_statistics.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __PCIE_STATISTICS_H_
-#define __PCIE_STATISTICS_H_
+#ifndef PCIE_STATISTICS_H
+#define PCIE_STATISTICS_H
 
 #include "pcie_common_api.h"
 
@@ -127,4 +127,4 @@ int pcie_port_distribution_get(uint32_t chip_id);
 int pcie_error_state_get(uint32_t port_id);
 int pcie_error_state_clear(uint32_t port_id);
 
-#endif
+#endif /* PCIE_STATISTICS_H */
diff --git a/pcie/usr_cmd/cmd_analysis/pcie_tools_include.h b/pcie/usr_cmd/cmd_analysis/pcie_tools_include.h
index 83b7349..823f8b5 100644
--- a/pcie/usr_cmd/cmd_analysis/pcie_tools_include.h
+++ b/pcie/usr_cmd/cmd_analysis/pcie_tools_include.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __PCIE_TOOLS_INCLUDE_H_
-#define __PCIE_TOOLS_INCLUDE_H_
+#ifndef PCIE_TOOLS_INCLUDE_H
+#define PCIE_TOOLS_INCLUDE_H
 
 #include "hikptdev_plug.h"
 #include "tool_lib.h"
@@ -29,4 +29,4 @@ struct tool_pcie_cmd {
 	uint32_t read_module_val;
 };
 
-#endif
+#endif /* PCIE_TOOLS_INCLUDE_H */
diff --git a/pcie/usr_cmd/interface/pcie_common_api.h b/pcie/usr_cmd/interface/pcie_common_api.h
index 08d4403..59d41ed 100644
--- a/pcie/usr_cmd/interface/pcie_common_api.h
+++ b/pcie/usr_cmd/interface/pcie_common_api.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __PCIE_COMMON_API_H_
-#define __PCIE_COMMON_API_H_
+#ifndef PCIE_COMMON_API_H
+#define PCIE_COMMON_API_H
 
 #include <stdint.h>
 #include <stdio.h>
@@ -42,4 +42,4 @@ struct pcie_comm_api {
 
 struct pcie_comm_api *pcie_get_comm_api(void);
 
-#endif
+#endif /* PCIE_COMMON_API_H */
diff --git a/sas/sas_func/sas_analy_queue.h b/sas/sas_func/sas_analy_queue.h
index 59100f4..7107b5c 100644
--- a/sas/sas_func/sas_analy_queue.h
+++ b/sas/sas_func/sas_analy_queue.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __SAS_ANALY_DQ_H_
-#define __SAS_ANALY_DQ_H_
+#ifndef SAS_ANALY_DQ_H
+#define SAS_ANALY_DQ_H
 
 #include "sas_tools_include.h"
 
@@ -35,4 +35,4 @@ struct sas_analy_para {
 
 int sas_analy_cmd(struct tool_sas_cmd *cmd);
 
-#endif
+#endif /* SAS_ANALY_DQ_H */
diff --git a/sas/sas_func/sas_common.h b/sas/sas_func/sas_common.h
index c33a2fe..eed0fa5 100644
--- a/sas/sas_func/sas_common.h
+++ b/sas/sas_func/sas_common.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __SAS_COMMON_H_
-#define __SAS_COMMON_H_
+#ifndef SAS_COMMON_H
+#define SAS_COMMON_H
 
 #define RESP_MAX_NUM 60
 #define SAS_MAX_PHY_NUM 7
@@ -84,4 +84,4 @@ enum sas_dqe_cmd_type {
 	DQE_UNKNOWN_TYPE,
 };
 
-#endif
+#endif /* SAS_COMMON_H */
diff --git a/sas/sas_func/sas_dump_reg.h b/sas/sas_func/sas_dump_reg.h
index 06dca72..f2c2e69 100644
--- a/sas/sas_func/sas_dump_reg.h
+++ b/sas/sas_func/sas_dump_reg.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __SAS_DUMP_REG_H_
-#define __SAS_DUMP_REG_H_
+#ifndef SAS_DUMP_REG_H
+#define SAS_DUMP_REG_H
 
 #include "sas_tools_include.h"
 
@@ -24,4 +24,4 @@ struct sas_dump_req_para {
 
 int sas_reg_dump(struct tool_sas_cmd *cmd);
 
-#endif
+#endif /* SAS_DUMP_REG_H */
diff --git a/sas/sas_func/sas_read_dev.h b/sas/sas_func/sas_read_dev.h
index 47d984f..7049994 100644
--- a/sas/sas_func/sas_read_dev.h
+++ b/sas/sas_func/sas_read_dev.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __SAS_DEV_H_
-#define __SAS_DEV_H_
+#ifndef SAS_DEV_H
+#define SAS_DEV_H
 
 #include "sas_tools_include.h"
 
@@ -48,4 +48,4 @@ struct hikp_sas_itct {
 
 int sas_dev(const struct tool_sas_cmd *cmd);
 
-#endif
+#endif /* SAS_DEV_H */
diff --git a/sas/sas_func/sas_read_dqe.h b/sas/sas_func/sas_read_dqe.h
index 28c0592..95e1ff3 100644
--- a/sas/sas_func/sas_read_dqe.h
+++ b/sas/sas_func/sas_read_dqe.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __SAS_DQE_H_
-#define __SAS_DQE_H_
+#ifndef SAS_DQE_H
+#define SAS_DQE_H
 
 #include "sas_tools_include.h"
 
@@ -82,4 +82,4 @@ struct hisi_sas_dq_info {
 
 int sas_dqe(const struct tool_sas_cmd *cmd);
 
-#endif
+#endif /* SAS_DQE_H */
diff --git a/sas/sas_func/sas_read_errcode.h b/sas/sas_func/sas_read_errcode.h
index c597c16..3ee7f11 100644
--- a/sas/sas_func/sas_read_errcode.h
+++ b/sas/sas_func/sas_read_errcode.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __SAS_ERRCODE_REG_H_
-#define __SAS_ERRCODE_REG_H_
+#ifndef SAS_ERRCODE_REG_H
+#define SAS_ERRCODE_REG_H
 
 #include "sas_tools_include.h"
 
@@ -23,4 +23,4 @@ struct sas_errcode_req_para {
 
 int sas_errcode_read(struct tool_sas_cmd *cmd);
 
-#endif
+#endif /* SAS_ERRCODE_REG_H */
diff --git a/sas/user_cmd/cmd_code/sas_tools_include.h b/sas/user_cmd/cmd_code/sas_tools_include.h
index 0aa7703..a0e4b1b 100644
--- a/sas/user_cmd/cmd_code/sas_tools_include.h
+++ b/sas/user_cmd/cmd_code/sas_tools_include.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __SAS_TOOLS_INCLUDE_H_
-#define __SAS_TOOLS_INCLUDE_H_
+#ifndef SAS_TOOLS_INCLUDE_H
+#define SAS_TOOLS_INCLUDE_H
 
 #include "hikptdev_plug.h"
 #include "tool_lib.h"
@@ -42,4 +42,4 @@ int sas_set_die_id(struct major_cmd_ctrl *self, const char *argv);
 int sas_set_que_id(struct major_cmd_ctrl *self, const char *argv);
 int sas_set_dqe_id(struct major_cmd_ctrl *self, const char *argv);
 
-#endif
+#endif /* SAS_TOOLS_INCLUDE_H */
diff --git a/sata/sata_func/sata_common.h b/sata/sata_func/sata_common.h
index 82e39c0..01ea13c 100644
--- a/sata/sata_func/sata_common.h
+++ b/sata/sata_func/sata_common.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __SATA_COMMON_H_
-#define __SATA_COMMON_H_
+#ifndef SATA_COMMON_H
+#define SATA_COMMON_H
 
 #define SATA_MAX_PORT_NUM 1
 #define RESP_MAX_NUM 60
@@ -28,4 +28,4 @@ enum sata_dump_cmd_type {
 	DUMP_PORTX,
 };
 
-#endif
+#endif /* SATA_COMMON_H */
diff --git a/sata/sata_func/sata_dump_reg.h b/sata/sata_func/sata_dump_reg.h
index 972ab71..8ea93ad 100644
--- a/sata/sata_func/sata_dump_reg.h
+++ b/sata/sata_func/sata_dump_reg.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __SATA_DUMP_REG_H_
-#define __SATA_DUMP_REG_H_
+#ifndef SATA_DUMP_REG_H
+#define SATA_DUMP_REG_H
 
 #include "sata_tools_include.h"
 
@@ -24,4 +24,4 @@ struct sata_dump_req_para {
 
 int sata_reg_dump(struct tool_sata_cmd *cmd);
 
-#endif
+#endif /* SATA_DUMP_REG_H */
diff --git a/sata/user_cmd/cmd_code/sata_tools_include.h b/sata/user_cmd/cmd_code/sata_tools_include.h
index a9671a9..bafb52a 100644
--- a/sata/user_cmd/cmd_code/sata_tools_include.h
+++ b/sata/user_cmd/cmd_code/sata_tools_include.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __SATA_TOOLS_INCLUDE_H_
-#define __SATA_TOOLS_INCLUDE_H_
+#ifndef SATA_TOOLS_INCLUDE_H
+#define SATA_TOOLS_INCLUDE_H
 
 #include "hikptdev_plug.h"
 #include "tool_lib.h"
@@ -26,4 +26,4 @@ struct tool_sata_cmd {
 	uint32_t die_id;
 };
 
-#endif
+#endif /* SATA_TOOLS_INCLUDE_H */
diff --git a/serdes/hikp_serdes.h b/serdes/hikp_serdes.h
index 83c28b8..2c04e8a 100644
--- a/serdes/hikp_serdes.h
+++ b/serdes/hikp_serdes.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __HIKP_SERDES_H__
-#define __HIKP_SERDES_H__
+#ifndef HIKP_SERDES_H
+#define HIKP_SERDES_H
 
 #include <stdlib.h>
 #include <sys/types.h>
@@ -21,8 +21,6 @@
 #include <linux/if.h>
 #include "tool_lib.h"
 
-#define __SERDES_DESC(x) 1
-
 enum serdes_cmd_type_e {
 	SERDES_SYS_RESERVE0        = 0,
 	SERDES_SYS_RESERVE1        = 1,
@@ -212,4 +210,4 @@ struct hilink_brief_info {
 	uint32_t rsvd_1;
 };
 
-#endif
+#endif /* HIKP_SERDES_H */
diff --git a/socip/hikp_socip.h b/socip/hikp_socip.h
index c98f136..8d3f31b 100644
--- a/socip/hikp_socip.h
+++ b/socip/hikp_socip.h
@@ -10,8 +10,8 @@
  *
  * See the Mulan PSL v2 for more details.
  */
-#ifndef __HIKP_SOCIP_H__
-#define __HIKP_SOCIP_H__
+#ifndef HIKP_SOCIP_H
+#define HIKP_SOCIP_H
 
 #include <stdint.h>
 
@@ -46,4 +46,4 @@ struct socip_dump_reg_req_data_t {
 	uint8_t controller_id;
 };
 
-#endif /* __HIKP_SOCIP_H__ */
+#endif /* HIKP_SOCIP_H */
diff --git a/tool_lib/tool_cmd.h b/tool_lib/tool_cmd.h
index 566b2a3..1aaaf22 100644
--- a/tool_lib/tool_cmd.h
+++ b/tool_lib/tool_cmd.h
@@ -79,4 +79,4 @@ extern void cmd_option_register(const char *little, const char *large, uint8_t h
 extern void command_parse_and_excute(const int argc, const char **argv);
 extern struct major_cmd_ctrl *get_major_cmd(void);
 
-#endif
+#endif /* TOOL_CMD_H */
diff --git a/tool_lib/tool_lib.h b/tool_lib/tool_lib.h
index 644a08e..15dac74 100644
--- a/tool_lib/tool_lib.h
+++ b/tool_lib/tool_lib.h
@@ -11,8 +11,8 @@
  * See the Mulan PSL v2 for more details.
  */
 
-#ifndef __TOOL_LIB_H__
-#define __TOOL_LIB_H__
+#ifndef TOOL_LIB_H
+#define TOOL_LIB_H
 
 #include "ossl_user_linux.h"
 
@@ -105,4 +105,4 @@ int generate_file_name(unsigned char *file_name, uint32_t file_name_len,
 		       const unsigned char *prefix);
 bool tool_can_print(uint32_t interval, uint32_t burst, uint32_t *print_num, uint64_t *last_time);
 
-#endif
+#endif /* TOOL_LIB_H */
-- 
2.45.0.windows.1

