ice: remove unused ice_flow_entry fields

Remove ::entry and ::entry_sz fields of &ice_flow_entry,
as they were never set.

Suggested-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/intel/ice/ice_flow.c b/drivers/net/ethernet/intel/ice/ice_flow.c
index 85cca572c22a54d953cf0c2d323e4de00b8c8e3a..fb8b925aaf8bb7e41dd0c5c94031f620e5a9e6a5 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_flow.c
+++ b/drivers/net/ethernet/intel/ice/ice_flow.c
@@ -1318,7 +1318,6 @@ ice_flow_rem_entry_sync(struct ice_hw *hw, enum ice_block __always_unused blk,
 
        list_del(&entry->l_entry);
 
-       devm_kfree(ice_hw_to_dev(hw), entry->entry);
        devm_kfree(ice_hw_to_dev(hw), entry);
 
        return 0;
@@ -1645,10 +1644,8 @@ ice_flow_add_entry(struct ice_hw *hw, enum ice_block blk, u64 prof_id,
        *entry_h = ICE_FLOW_ENTRY_HNDL(e);
 
 out:
-       if (status && e) {
-               devm_kfree(ice_hw_to_dev(hw), e->entry);
+       if (status)
                devm_kfree(ice_hw_to_dev(hw), e);
-       }
 
        return status;
 }

diff --git a/drivers/net/ethernet/intel/ice/ice_flow.h b/drivers/net/ethernet/intel/ice/ice_flow.h
index b465d27d9b801cc97da80a02c8a4d5009432baa8..96923ef0a5a8c96a5572d8a2221e69df5b0b2cea 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_flow.h
+++ b/drivers/net/ethernet/intel/ice/ice_flow.h
@@ -350,11 +350,8 @@ struct ice_flow_entry {
 
        u64 id;
        struct ice_flow_prof *prof;
-       /* Flow entry's content */
-       void *entry;
        enum ice_flow_priority priority;
        u16 vsi_handle;
-       u16 entry_sz;
 };
 
 #define ICE_FLOW_ENTRY_HNDL(e) ((u64)(uintptr_t)e)