diff mbox series

[v2,35/42] net/e1000/base: cleanup duplicate defines

Message ID	20200624075337.6768-36-guinanx.sun@intel.com (mailing list archive)
State	Superseded, archived
Delegated to:	Qi Zhang
Headers	show Return-Path: <dev-bounces@dpdk.org> IronPort-SDR: TcwYvhvpaKm3KDJAvoSMPh/lQtLgHQ+0cXSoPQxx20SkUCPfrBWVHCRW1ZhN4594NofwyBZ1PD OE3azhBEx7rA== IronPort-SDR: EvxkkEVVmOBGPnJBWNLPF4oJXJKK5Y98fZCw27xgBp8rvey2j1S9TbyQSTjupYeqA8NzQJZvVA myNf3drG1/Sw== From: Guinan Sun <guinanx.sun@intel.com> To: dev@dpdk.org Cc: Jeff Guo <jia.guo@intel.com>, Wenzhuo Lu <wenzhuo.lu@intel.com>, Guinan Sun <guinanx.sun@intel.com>, Jeff Kirsher <jeffrey.t.kirsher@intel.com> Date: Wed, 24 Jun 2020 07:53:30 +0000 Message-Id: <20200624075337.6768-36-guinanx.sun@intel.com> In-Reply-To: <20200624075337.6768-1-guinanx.sun@intel.com> References: <20200622064634.70941-1-guinanx.sun@intel.com> <20200624075337.6768-1-guinanx.sun@intel.com> Subject: [dpdk-dev] [PATCH v2 35/42] net/e1000/base: cleanup duplicate defines Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>
Series	update e1000 base code \| expand [v2,00/42] update e1000 base code [v2,01/42] net/e1000/base: resolve flash presence for i210 devices [v2,02/42] net/e1000/base: i210 slow system clock update [v2,03/42] net/e1000/base: add ICL device id's [v2,04/42] net/e1000/base: remove shadowing variable declarations [v2,05/42] net/e1000/base: introduce flags [v2,06/42] net/e1000/base: modify MAC initialization for i211 [v2,07/42] net/e1000/base: modify parens to match other MAC checks [v2,08/42] net/e1000/base: expose xmdio methods [v2,09/42] net/e1000/base: fall through explicitly [v2,10/42] net/e1000/base: add function parameter descriptions [v2,11/42] net/e1000/base: modify fall through code comments [v2,12/42] net/e1000/base: modify klocwork errors [v2,13/42] net/e1000/base: modify klockwork about unused return values [v2,14/42] net/e1000/base: improve coding style [v2,15/42] net/e1000/base: modify HW level time sync mechanisms [v2,16/42] net/e1000/base: modify description [v2,17/42] net/e1000/base: remove duplicated codes from 82575 [v2,18/42] net/e1000/base: add definitions for ETQF register bit [v2,19/42] net/e1000/base: cleanup duplicate declaration [v2,20/42] net/e1000/base: expose MAC functions [v2,21/42] net/e1000/base: move definitions from 82575 to defines file [v2,22/42] net/e1000/base: add define to PCIm function state [v2,23/42] net/e1000/base: add missing register defines [v2,24/42] net/e1000/base: move the device reset definition [v2,25/42] net/e1000/base: increased timeout for ME ULP exit [v2,26/42] net/e1000/base: add missing device ID [v2,27/42] net/e1000/base: expose more future extended NVM [v2,28/42] net/e1000/base: add definition of EEE 2.5G setup register [v2,29/42] net/e1000/base: remove definitions [v2,30/42] net/e1000/base: remove useless statement [v2,31/42] net/e1000/base: add missed define for VFTA [v2,32/42] net/e1000/base: modify flow control setup [v2,33/42] net/e1000/base: led blinking fix for i210 [v2,34/42] net/e1000/base: expose new FEXTNVM registers and masks [v2,35/42] net/e1000/base: cleanup duplicate defines [v2,36/42] net/e1000/base: add support for Nahum10 [v2,37/42] net/e1000/base: add fall-through comments for switch cases [v2,38/42] net/e1000/base: modify typo in Alder Lake brand name [v2,39/42] net/e1000/base: introduce DPGFR register [v2,40/42] net/e1000/base: remove conditional compilation wrapper [v2,41/42] net/e1000/base: modify copyright [v2,42/42] net/e1000/base: update version

Checks

Context	Check	Description
ci/Intel-compilation	success	Compilation OK
ci/checkpatch	success	coding style OK

Commit Message

Guinan Sun June 24, 2020, 7:53 a.m. UTC

Now that more than one silicon family uses the filter defines for ETQF,
move the defines out of the 82575 silicon family header, into the
general register/defines location.

This will reduce the duplicate defines for drivers that support all the
silicon families in one driver.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Guinan Sun <guinanx.sun@intel.com>
---
 drivers/net/e1000/base/e1000_82575.h | 3 ---
 1 file changed, 3 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/e1000/base/e1000_82575.h b/drivers/net/e1000/base/e1000_82575.h
index 41ead1c68..14887e25f 100644
--- a/drivers/net/e1000/base/e1000_82575.h
+++ b/drivers/net/e1000/base/e1000_82575.h
@@ -273,9 +273,6 @@  struct e1000_adv_context_desc {
 #define E1000_IMS_LSECPNS	E1000_ICR_LSECPNS /* PN threshold - server */
 #define E1000_ICS_LSECPNS	E1000_ICR_LSECPNS /* PN threshold - server */
 
-/* ETQF register bit definitions */
-#define E1000_ETQF_FILTER_ENABLE	(1 << 26)
-#define E1000_ETQF_IMM_INT		(1 << 29)
 /*
  * ETQF filter list: one static filter per filter consumer. This is
  *                   to avoid filter collisions later. Add new filters