net: ngbe: remove redundant macros

NGBE_NCSI_SUP and NGBE_NCSI_MASK are duplicate-defined, they can be
replaced by the macros defined in libwx. Just remove them.

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
Reviewed-by: Joe Damato <joe@dama.to>
Link: https://patch.msgid.link/20260407025616.33652-4-jiawenwu@trustnetic.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
index e28ddf684a060dc198281ff120feabe31b487c89..8c9d505721b17f47ddd1b8a94ffa1f7dd3e8bc9a 100644 (file)
--- a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
+++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
@@ -57,7 +57,7 @@ static void ngbe_init_type_code(struct wx *wx)
 
        wx->mac.type = wx_mac_em;
        type_mask = (u16)(wx->subsystem_device_id & NGBE_OEM_MASK);
-       ncsi_mask = wx->subsystem_device_id & NGBE_NCSI_MASK;
+       ncsi_mask = wx->subsystem_device_id & WX_NCSI_MASK;
        wol_mask = wx->subsystem_device_id & WX_WOL_MASK;
 
        val = rd32(wx, WX_CFG_PORT_ST);
@@ -66,7 +66,7 @@ static void ngbe_init_type_code(struct wx *wx)
                       em_mac_type_mdi;
 
        wx->wol_hw_supported = (wol_mask == WX_WOL_SUP) ? 1 : 0;
-       wx->ncsi_enabled = (ncsi_mask == NGBE_NCSI_MASK ||
+       wx->ncsi_enabled = (ncsi_mask == WX_NCSI_SUP ||
                           type_mask == NGBE_SUBID_OCP_CARD) ? 1 : 0;
 
        switch (type_mask) {

diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h b/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h
index f1957fa0add47d49ad90fd78af21dc95c4008834..7077a0da4c986a8ee1205c90f6b534ffb60b1ab8 100644 (file)
--- a/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h
+++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h
@@ -37,9 +37,6 @@
 
 #define NGBE_OEM_MASK                          0x00FF
 
-#define NGBE_NCSI_SUP                          0x8000
-#define NGBE_NCSI_MASK                         0x8000
-
 /**************** EM Registers ****************************/
 /* chip control Registers */
 #define NGBE_MIS_PRB_CTL                       0x10010