Skip to content

Commit

Permalink
ice: remove unused ice_flow_entry fields
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Przemek Kitszel authored and David S. Miller committed Oct 20, 2023
1 parent 20c6e05 commit 4cd7bc7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
5 changes: 1 addition & 4 deletions drivers/net/ethernet/intel/ice/ice_flow.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
3 changes: 0 additions & 3 deletions drivers/net/ethernet/intel/ice/ice_flow.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 4cd7bc7

Please sign in to comment.