net: hns: delete redundant macro definition

This patch deletes redundant macro definitions in hns drivers.
And change the .h file containing relation to make the layers
more clearly

Signed-off-by: Qianqian Xie <[email protected]>
Signed-off-by: Weiwei Deng <[email protected]>
Reviewed-by: Yisen Zhuang <[email protected]>
Signed-off-by: Salil Mehta <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
index 2d0cb609adc33415ab0c724ff266e1f4a145d694..193248f754a12c5eca361ad81d7d439bc20ebeff 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
@@ -18,9 +18,6 @@
 #include "hns_dsaf_rcb.h"
 
 #define AE_NAME_PORT_ID_IDX 6
-#define ETH_STATIC_REG  1
-#define ETH_DUMP_REG    5
-#define ETH_GSTRING_LEN        32
 
 static struct hns_mac_cb *hns_get_mac_cb(struct hnae_handle *handle)
 {

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h
index a9b0cb3874aa65abadadcdbcd809bdb9f883d207..ca7e17520f1d298a622f88f7db15024f8192fbb1 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h
@@ -407,7 +407,7 @@ struct mac_driver {
 };
 
 struct mac_stats_string {
-       char desc[64];
+       char desc[ETH_GSTRING_LEN];
        unsigned long offset;
 };
 

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
index 3eb8b4d6330f768a3e2fa3b5ebde34831110415b..f5505e84352ff14d771679ff919052c82412d911 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
@@ -314,7 +314,6 @@
 #define PPE_COM_INTEN_REG                      0x110
 #define PPE_COM_RINT_REG                       0x114
 #define PPE_COM_INTSTS_REG                     0x118
-#define PPE_COM_COMMON_CNT_CLR_CE_REG          0x1120
 #define PPE_COM_HIS_RX_PKT_QID_DROP_CNT_REG    0x300
 #define PPE_COM_HIS_RX_PKT_QID_OK_CNT_REG      0x600
 #define PPE_COM_HIS_TX_PKT_QID_ERR_CNT_REG     0x900