Remove unnecessary fields in data structure for 1588 and QoS
func capabilities.
Signed-off-by: Karol Kolacinski <karol.kolacin...@intel.com>
Signed-off-by: Qi Zhang <qi.z.zh...@intel.com>
---
drivers/net/ice/base/ice_common.c | 5 ++---
drivers/net/ice/base/ice_switch.c | 2 --
drivers/net/ice/base/ice_type.h | 6 ------
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ice/base/ice_common.c
b/drivers/net/ice/base/ice_common.c
index 44592d20bf..3d4e05f2b0 100644
--- a/drivers/net/ice/base/ice_common.c
+++ b/drivers/net/ice/base/ice_common.c
@@ -2579,7 +2579,7 @@ ice_parse_1588_func_caps(struct ice_hw *hw, struct
ice_hw_func_caps *func_p,
* related information.
*/
ice_debug(hw, ICE_DBG_INIT, "1588 func caps: unknown clock
frequency %u\n",
- info->clk_freq);
+ clk_freq);
info->time_ref = ICE_TIME_REF_FREQ_25_000;
}
@@ -2594,7 +2594,7 @@ ice_parse_1588_func_caps(struct ice_hw *hw, struct
ice_hw_func_caps *func_p,
ice_debug(hw, ICE_DBG_INIT, "func caps: tmr_index_assoc = %u\n",
info->tmr_index_assoc);
ice_debug(hw, ICE_DBG_INIT, "func caps: clk_freq = %u\n",
- info->clk_freq);
+ clk_freq);
ice_debug(hw, ICE_DBG_INIT, "func caps: clk_src = %u\n",
info->clk_src);
}
@@ -2752,7 +2752,6 @@ ice_parse_1588_dev_caps(struct ice_hw *hw, struct
ice_hw_dev_caps *dev_p,
struct ice_aqc_list_caps_elem *cap)
{
struct ice_ts_dev_info *info = &dev_p->ts_dev_info;
- u32 logical_id = LE32_TO_CPU(cap->logical_id);
u32 phys_id = LE32_TO_CPU(cap->phys_id);
u32 number = LE32_TO_CPU(cap->number);
diff --git a/drivers/net/ice/base/ice_switch.c
b/drivers/net/ice/base/ice_switch.c
index afc0fff84b..ac045790ad 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -3546,8 +3546,6 @@ ice_init_port_info(struct ice_port_info *pi, u16
vsi_port_num, u8 type,
pi->sw_id = swid;
pi->pf_vf_num = pf_vf_num;
pi->is_vf = is_vf;
- pi->dflt_tx_vsi_num = ICE_DFLT_VSI_INVAL;
- pi->dflt_rx_vsi_num = ICE_DFLT_VSI_INVAL;
break;
default:
ice_debug(pi->hw, ICE_DBG_SW, "incorrect VSI/port type
received\n");
diff --git a/drivers/net/ice/base/ice_type.h b/drivers/net/ice/base/ice_type.h
index 043dae7781..fc5b4b4c5c 100644
--- a/drivers/net/ice/base/ice_type.h
+++ b/drivers/net/ice/base/ice_type.h
@@ -661,7 +661,6 @@ enum ice_clk_src {
struct ice_ts_func_info {
/* Function specific info */
enum ice_time_ref_freq time_ref;
- u8 clk_freq;
u8 clk_src : 1;
u8 tmr_index_assoc : 1;
u8 ena : 1;
@@ -683,7 +682,6 @@ struct ice_ts_func_info {
struct ice_ts_dev_info {
/* Device specific info */
- u32 ena_ports;
u32 tmr_own_map;
u8 tmr0_owner;
u8 tmr1_owner;
@@ -1098,10 +1096,6 @@ struct ice_port_info {
#define ICE_SCHED_PORT_STATE_READY 0x1
u8 lport;
#define ICE_LPORT_MASK 0xff
- u16 dflt_tx_vsi_rule_id;
- u16 dflt_tx_vsi_num;
- u16 dflt_rx_vsi_rule_id;
- u16 dflt_rx_vsi_num;
struct ice_fc_info fc;
struct ice_mac_info mac;
struct ice_phy_info phy;
--
2.31.1
