i40e: remove unused defines
Subsystems (2)
PATCH v3 1/1 i40e: remove unused defines
From: Jesse Brandeburg <[email protected]>
Remove all the unused defines as they are just dead weight.
---
v2: fix patch to apply to current dev-queue branch (where i40e_client.h
has moved to include/linux/net/intel/)
v3: add back 2 defines that were still in use
drivers/net/ethernet/intel/i40e/i40e.h | 20 - .../net/ethernet/intel/i40e/i40e_adminq_cmd.h | 482 +- drivers/net/ethernet/intel/i40e/i40e_common.c | 4 - drivers/net/ethernet/intel/i40e/i40e_dcb.h | 5 - .../net/ethernet/intel/i40e/i40e_debugfs.c | 1 - drivers/net/ethernet/intel/i40e/i40e_devids.h | 3 - drivers/net/ethernet/intel/i40e/i40e_hmc.h | 1 - drivers/net/ethernet/intel/i40e/i40e_main.c | 3 - drivers/net/ethernet/intel/i40e/i40e_osdep.h | 1 - .../net/ethernet/intel/i40e/i40e_register.h | 4664 ----------------- drivers/net/ethernet/intel/i40e/i40e_txrx.h | 25 - drivers/net/ethernet/intel/i40e/i40e_type.h | 81 - .../ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 - include/linux/net/intel/i40e_client.h | 5 - 14 files changed, 1 insertion(+), 5295 deletions(-)
drivers/net/ethernet/intel/i40e/i40e.h +0 -20
@@ -60,17 +60,14 @@ (((pf)->hw_features & I40E_HW_RSS_AQ_CAPABLE) ? 4 : 1)#define I40E_DEFAULT_QUEUES_PER_VF 4#define I40E_MAX_VF_QUEUES 16 -#define I40E_DEFAULT_QUEUES_PER_TC 1/* should be a power of 2 */ #define i40e_pf_get_max_q_per_tc (pf) \ (((pf)->hw_features & I40E_HW_128_QP_RSS_CAPABLE) ? 128 : 64) -#define I40E_FDIR_RING 0#define I40E_FDIR_RING_COUNT 32#define I40E_MAX_AQ_BUF_SIZE 4096#define I40E_AQ_LEN 256#define I40E_AQ_WORK_LIMIT 66/* max number of VFs + a little */ #define I40E_MAX_USER_PRIORITY 8#define I40E_DEFAULT_TRAFFIC_CLASS BIT(0) -#define I40E_DEFAULT_MSG_ENABLE 4#define I40E_QUEUE_WAIT_RETRY_LIMIT 10#define I40E_INT_NAME_STR_LEN (IFNAMSIZ + 16)
@@ -93,8 +90,6 @@#define I40E_OEM_RELEASE_MASK 0x0000ffff/* The values in here are decimal coded as hex as is the case in the NVM map*/ -#define I40E_CURRENT_NVM_VERSION_HI 0x2 -#define I40E_CURRENT_NVM_VERSION_LO 0x40#define I40E_RX_DESC (R , i) \ (&(((union i40e_32byte_rx_desc *)((R)->desc))[i]))
@@ -106,7 +101,6 @@ (&(((struct i40e_filter_program_desc *)((R )->desc))[i]))/* default to trying for four seconds */ -#define I40E_TRY_LINK_TIMEOUT (4 * HZ) /* BW rate limiting */#define I40E_BW_CREDIT_DIVISOR 50/* 50Mbps per BW credit */
@@ -295,9 +289,6 @@ struct i40e_cloud_filter {u8 tunnel_type; }; -#define I40E_DCB_PRIO_TYPE_STRICT 0 -#define I40E_DCB_PRIO_TYPE_ETS 1 -#define I40E_DCB_STRICT_PRIO_CREDITS 127/* DCB per TC information data structure */ struct i40e_tc_info {u16 qoffset;/* Queue offset from base queue */
@@ -357,15 +348,6 @@ struct i40e_ddp_old_profile_list { I40E_FLEX_SET_FSIZE(fsize) | \ I40E_FLEX_SET_SRC_WORD(src)) -#define I40E_FLEX_PIT_GET_SRC (flex) (((flex) & \ - I40E_PRTQF_FLX_PIT_SOURCE_OFF_MASK) >> \ - I40E_PRTQF_FLX_PIT_SOURCE_OFF_SHIFT) -#define I40E_FLEX_PIT_GET_DST (flex) (((flex) & \ - I40E_PRTQF_FLX_PIT_DEST_OFF_MASK) >> \ - I40E_PRTQF_FLX_PIT_DEST_OFF_SHIFT) -#define I40E_FLEX_PIT_GET_FSIZE (flex) (((flex) & \ - I40E_PRTQF_FLX_PIT_FSIZE_MASK) >> \ - I40E_PRTQF_FLX_PIT_FSIZE_SHIFT)#define I40E_MAX_FLEX_SRC_OFFSET 0x1F
@@ -390,7 +372,6 @@ struct i40e_ddp_old_profile_list {#define I40E_L4_GLQF_ORT_IDX 35/* Flex PIT register index */ -#define I40E_FLEX_PIT_IDX_START_L2 0#define I40E_FLEX_PIT_IDX_START_L3 3#define I40E_FLEX_PIT_IDX_START_L4 6
@@ -531,7 +512,6 @@ struct i40e_pf {#define I40E_HW_GENEVE_OFFLOAD_CAPABLE BIT(9)#define I40E_HW_PTP_L4_CAPABLE BIT(10)#define I40E_HW_WOL_MC_MAGIC_PKT_WAKE BIT(11) -#define I40E_HW_MPLS_HDR_OFFLOAD_CAPABLE BIT(12)#define I40E_HW_HAVE_CRT_RETIMER BIT(13)#define I40E_HW_OUTER_UDP_CSUM_CAPABLE BIT(14)#define I40E_HW_PHY_CONTROLS_LEDS BIT(15)
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h +1 -481
1,068 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_common.c +0 -4
@@ -1455,10 +1455,6 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int idx)return gpio_val; } -#define I40E_COMBINED_ACTIVITY 0xA -#define I40E_FILTER_ACTIVITY 0xE -#define I40E_LINK_ACTIVITY 0xC -#define I40E_MAC_ACTIVITY 0xD#define I40E_FW_LED BIT(4)#define I40E_LED_MODE_VALID (I40E_GLGEN_GPIO_CTL_LED_MODE_MASK >> \ I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT)
drivers/net/ethernet/intel/i40e/i40e_dcb.h +0 -5
@@ -6,10 +6,8 @@#include "i40e_type.h" -#define I40E_DCBX_STATUS_NOT_STARTED 0#define I40E_DCBX_STATUS_IN_PROGRESS 1#define I40E_DCBX_STATUS_DONE 2 -#define I40E_DCBX_STATUS_MULTIPLE_PEERS 3#define I40E_DCBX_STATUS_DISABLED 7#define I40E_TLV_TYPE_END 0
@@ -24,7 +22,6 @@#define I40E_CEE_DCBX_OUI 0x001b21#define I40E_CEE_DCBX_TYPE 2 -#define I40E_CEE_SUBTYPE_CTRL 1#define I40E_CEE_SUBTYPE_PG_CFG 2#define I40E_CEE_SUBTYPE_PFC_CFG 3#define I40E_CEE_SUBTYPE_APP_PRI 4
@@ -105,9 +102,7 @@ struct i40e_cee_ctrl_tlv {struct i40e_cee_feat_tlv {struct i40e_cee_tlv_hdr hdr;u8 en_will_err;/* Bits: |En|Will|Err|Reserved(5)| */ -#define I40E_CEE_FEAT_TLV_ENABLE_MASK 0x80#define I40E_CEE_FEAT_TLV_WILLING_MASK 0x40 -#define I40E_CEE_FEAT_TLV_ERR_MASK 0x20u8 subtype;u8 tlvinfo[1 ]; };
drivers/net/ethernet/intel/i40e/i40e_debugfs.c +0 -1
@@ -688,7 +688,6 @@ static void i40e_dbg_dump_vf_all(struct i40e_pf *pf)i40e_dbg_dump_vf (pf, i); } -#define I40E_MAX_DEBUG_OUT_BUFFER (4096*4)/** * i40e_dbg_command_write - write into command datum * @filp: the opened file
drivers/net/ethernet/intel/i40e/i40e_devids.h +0 -3
@@ -32,8 +32,5 @@#define I40E_DEV_ID_10G_BASE_T_X722 0x37D2#define I40E_DEV_ID_SFP_I_X722 0x37D3 -#define i40e_is_40G_device (d) ((d) == I40E_DEV_ID_QSFP_A || \ - (d) == I40E_DEV_ID_QSFP_B || \ - (d) == I40E_DEV_ID_QSFP_C)#endif /* _I40E_DEVIDS_H_ */
drivers/net/ethernet/intel/i40e/i40e_hmc.h +0 -1
@@ -14,7 +14,6 @@ struct i40e_hw;#define I40E_HMC_DIRECT_BP_SIZE 0x200000/* 2M */ #define I40E_HMC_PAGED_BP_SIZE 4096#define I40E_HMC_PD_BP_BUF_ALIGNMENT 4096 -#define I40E_FIRST_VF_FPM_ID 16struct i40e_hmc_obj_info {u64 base;/* base addr in FPM */
drivers/net/ethernet/intel/i40e/i40e_main.c +0 -3
@@ -6484,8 +6484,6 @@ static int i40e_init_pf_dcb(struct i40e_pf *pf) return err; }#endif /* CONFIG_I40E_DCB */ -#define SPEED_SIZE 14 -#define FC_SIZE 8/** * i40e_print_link_message - print link up or down * @vsi: the VSI for which link needs a message
@@ -8947,7 +8945,6 @@ u32 i40e_get_current_atr_cnt(struct i40e_pf *pf)* filter miss error on Rx queue 0. Accumulating enough error messages before * reacting will make sure we don't cause flush too often. */ -#define I40E_MAX_FD_PROGRAM_ERROR 256/** * i40e_fdir_reinit_subtask - Worker thread to reinit FDIR filter table
drivers/net/ethernet/intel/i40e/i40e_osdep.h +0 -1
@@ -26,7 +26,6 @@ do { \#define wr32 (a, reg, value) writel((value), ((a)->hw_addr + (reg)))#define rd32 (a, reg) readl((a)->hw_addr + (reg)) -#define wr64 (a, reg, value) writeq((value), ((a)->hw_addr + (reg)))#define rd64 (a, reg) readq((a)->hw_addr + (reg))#define i40e_flush (a) readl((a)->hw_addr + I40E_GLGEN_STAT)
drivers/net/ethernet/intel/i40e/i40e_register.h +0 -4664
1,782 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_txrx.h +0 -25
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/i40e/i40e_type.h +0 -81
81 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h +0 -1
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.24.1
Part of the diff is not shown here. View the raw message.
Bowers
PATCH v3 1/1 i40e: remove unused defines
Quoted 17 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Jeff Kirsher
Sent: Monday, January 6, 2020 4:10 PM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [net-next v3] i40e: remove unused definesFrom: Jesse Brandeburg <[email protected]>
Remove all the unused defines as they are just dead weight.
Signed-off-by Jesse Brandeburg <[email protected]>---
v2: fix patch to apply to current dev-queue branch (wherei40e_client.h
has moved toinclude/linux/net/intel/)
v3: add back 2 defines that were still in use
Quoted 15 lines
drivers/net/ethernet/intel/i40e/i40e.h | 20 - .../net/ethernet/intel/i40e/i40e_adminq_cmd.h | 482 +- drivers/net/ethernet/intel/i40e/i40e_common.c | 4 - drivers/net/ethernet/intel/i40e/i40e_dcb.h | 5 - .../net/ethernet/intel/i40e/i40e_debugfs.c | 1 - drivers/net/ethernet/intel/i40e/i40e_devids.h | 3 - drivers/net/ethernet/intel/i40e/i40e_hmc.h | 1 - drivers/net/ethernet/intel/i40e/i40e_main.c | 3 - drivers/net/ethernet/intel/i40e/i40e_osdep.h | 1 - .../net/ethernet/intel/i40e/i40e_register.h | 4664 ----------------- drivers/net/ethernet/intel/i40e/i40e_txrx.h | 25 - drivers/net/ethernet/intel/i40e/i40e_type.h | 81 - .../ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 - include/linux/net/intel/i40e_client.h | 5 - 14 files changed, 1 insertion(+), 5295 deletions(-)