net: ngbe: Move defines into unified file

Remove ngbe.h, move defines into ngbe_type.h file.

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe.h b/drivers/net/ethernet/wangxun/ngbe/ngbe.h
deleted file mode 100644 (file)
index ed832ab..0000000
--- a/drivers/net/ethernet/wangxun/ngbe/ngbe.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (c) 2019 - 2022 Beijing WangXun Technology Co., Ltd. */
-
-#ifndef _NGBE_H_
-#define _NGBE_H_
-
-#define NGBE_MAX_FDIR_INDICES          7
-
-#define NGBE_MAX_RX_QUEUES             (NGBE_MAX_FDIR_INDICES + 1)
-#define NGBE_MAX_TX_QUEUES             (NGBE_MAX_FDIR_INDICES + 1)
-
-#define NGBE_ETH_LENGTH_OF_ADDRESS     6
-#define NGBE_MAX_MSIX_VECTORS          0x09
-#define NGBE_RAR_ENTRIES               32
-
-/* TX/RX descriptor defines */
-#define NGBE_DEFAULT_TXD               512 /* default ring size */
-#define NGBE_DEFAULT_TX_WORK           256
-#define NGBE_MAX_TXD                   8192
-#define NGBE_MIN_TXD                   128
-
-#define NGBE_DEFAULT_RXD               512 /* default ring size */
-#define NGBE_DEFAULT_RX_WORK           256
-#define NGBE_MAX_RXD                   8192
-#define NGBE_MIN_RXD                   128
-
-#define NGBE_MAC_STATE_DEFAULT         0x1
-#define NGBE_MAC_STATE_MODIFIED                0x2
-#define NGBE_MAC_STATE_IN_USE          0x4
-
-extern char ngbe_driver_name[];
-
-#endif /* _NGBE_H_ */

diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_hw.c b/drivers/net/ethernet/wangxun/ngbe/ngbe_hw.c
index d54e22c..6e06a46 100644 (file)
--- a/drivers/net/ethernet/wangxun/ngbe/ngbe_hw.c
+++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_hw.c
@@ -9,7 +9,6 @@
 #include "../libwx/wx_hw.h"
 #include "ngbe_type.h"
 #include "ngbe_hw.h"
-#include "ngbe.h"
 
 int ngbe_eeprom_chksum_hostif(struct ngbe_adapter *adapter)
 {

diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
index 5d679c3..f7cb482 100644 (file)
--- a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
+++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
@@ -14,7 +14,7 @@
 #include "../libwx/wx_hw.h"
 #include "ngbe_type.h"
 #include "ngbe_hw.h"
-#include "ngbe.h"
+
 char ngbe_driver_name[] = "ngbe";
 
 /* ngbe_pci_tbl - PCI Device ID Table

diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h b/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h
index 5a64ce6..83e73ca 100644 (file)
--- a/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h
+++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h
@@ -90,6 +90,30 @@
 #define NGBE_FW_CMD_ST_PASS                    0x80658383
 #define NGBE_FW_CMD_ST_FAIL                    0x70657376
 
+#define NGBE_MAX_FDIR_INDICES                  7
+
+#define NGBE_MAX_RX_QUEUES                     (NGBE_MAX_FDIR_INDICES + 1)
+#define NGBE_MAX_TX_QUEUES                     (NGBE_MAX_FDIR_INDICES + 1)
+
+#define NGBE_ETH_LENGTH_OF_ADDRESS             6
+#define NGBE_MAX_MSIX_VECTORS                  0x09
+#define NGBE_RAR_ENTRIES                       32
+
+/* TX/RX descriptor defines */
+#define NGBE_DEFAULT_TXD                       512 /* default ring size */
+#define NGBE_DEFAULT_TX_WORK                   256
+#define NGBE_MAX_TXD                           8192
+#define NGBE_MIN_TXD                           128
+
+#define NGBE_DEFAULT_RXD                       512 /* default ring size */
+#define NGBE_DEFAULT_RX_WORK                   256
+#define NGBE_MAX_RXD                           8192
+#define NGBE_MIN_RXD                           128
+
+#define NGBE_MAC_STATE_DEFAULT         0x1
+#define NGBE_MAC_STATE_MODIFIED                0x2
+#define NGBE_MAC_STATE_IN_USE          0x4
+
 enum ngbe_phy_type {
        ngbe_phy_unknown = 0,
        ngbe_phy_none,
@@ -177,4 +201,6 @@ struct ngbe_adapter {
        u16 bd_number;
 };
 
+extern char ngbe_driver_name[];
+
 #endif /* _NGBE_TYPE_H_ */