Skip to content

Commit 9f453da

Browse files
pkitszelSasha Levin
pkitszel
authored and
Sasha Levin
committed
ice: remove null checks before devm_kfree() calls
[ Upstream commit ad667d6 ] We all know they are redundant. Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> Reviewed-by: Michal Wilczynski <michal.wilczynski@intel.com> Reviewed-by: Simon Horman <simon.horman@corigine.com> Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> Tested-by: Arpana Arland <arpanax.arland@intel.com> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> Stable-dep-of: adbf5a4 ("ice: remove af_xdp_zc_qps bitmap") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 77499fb commit 9f453da

File tree

6 files changed

+29
-75
lines changed

6 files changed

+29
-75
lines changed

‎drivers/net/ethernet/intel/ice/ice_common.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -789,8 +789,7 @@ static void ice_cleanup_fltr_mgmt_struct(struct ice_hw *hw)
789789
devm_kfree(ice_hw_to_dev(hw), lst_itr);
790790
}
791791
}
792-
if (recps[i].root_buf)
793-
devm_kfree(ice_hw_to_dev(hw), recps[i].root_buf);
792+
devm_kfree(ice_hw_to_dev(hw), recps[i].root_buf);
794793
}
795794
ice_rm_all_sw_replay_rule_info(hw);
796795
devm_kfree(ice_hw_to_dev(hw), sw->recp_list);
@@ -986,8 +985,7 @@ static int ice_cfg_fw_log(struct ice_hw *hw, bool enable)
986985
}
987986

988987
out:
989-
if (data)
990-
devm_kfree(ice_hw_to_dev(hw), data);
988+
devm_kfree(ice_hw_to_dev(hw), data);
991989

992990
return status;
993991
}

‎drivers/net/ethernet/intel/ice/ice_controlq.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,7 @@ do { \
339339
} \
340340
} \
341341
/* free the buffer info list */ \
342-
if ((qi)->ring.cmd_buf) \
343-
devm_kfree(ice_hw_to_dev(hw), (qi)->ring.cmd_buf); \
342+
devm_kfree(ice_hw_to_dev(hw), (qi)->ring.cmd_buf); \
344343
/* free DMA head */ \
345344
devm_kfree(ice_hw_to_dev(hw), (qi)->ring.dma_head); \
346345
} while (0)

‎drivers/net/ethernet/intel/ice/ice_flow.c

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,23 +1303,6 @@ ice_flow_find_prof_id(struct ice_hw *hw, enum ice_block blk, u64 prof_id)
13031303
return NULL;
13041304
}
13051305

1306-
/**
1307-
* ice_dealloc_flow_entry - Deallocate flow entry memory
1308-
* @hw: pointer to the HW struct
1309-
* @entry: flow entry to be removed
1310-
*/
1311-
static void
1312-
ice_dealloc_flow_entry(struct ice_hw *hw, struct ice_flow_entry *entry)
1313-
{
1314-
if (!entry)
1315-
return;
1316-
1317-
if (entry->entry)
1318-
devm_kfree(ice_hw_to_dev(hw), entry->entry);
1319-
1320-
devm_kfree(ice_hw_to_dev(hw), entry);
1321-
}
1322-
13231306
/**
13241307
* ice_flow_rem_entry_sync - Remove a flow entry
13251308
* @hw: pointer to the HW struct
@@ -1335,7 +1318,8 @@ ice_flow_rem_entry_sync(struct ice_hw *hw, enum ice_block __always_unused blk,
13351318

13361319
list_del(&entry->l_entry);
13371320

1338-
ice_dealloc_flow_entry(hw, entry);
1321+
devm_kfree(ice_hw_to_dev(hw), entry->entry);
1322+
devm_kfree(ice_hw_to_dev(hw), entry);
13391323

13401324
return 0;
13411325
}
@@ -1662,8 +1646,7 @@ ice_flow_add_entry(struct ice_hw *hw, enum ice_block blk, u64 prof_id,
16621646

16631647
out:
16641648
if (status && e) {
1665-
if (e->entry)
1666-
devm_kfree(ice_hw_to_dev(hw), e->entry);
1649+
devm_kfree(ice_hw_to_dev(hw), e->entry);
16671650
devm_kfree(ice_hw_to_dev(hw), e);
16681651
}
16691652

‎drivers/net/ethernet/intel/ice/ice_lib.c

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -320,31 +320,19 @@ static void ice_vsi_free_arrays(struct ice_vsi *vsi)
320320

321321
dev = ice_pf_to_dev(pf);
322322

323-
if (vsi->af_xdp_zc_qps) {
324-
bitmap_free(vsi->af_xdp_zc_qps);
325-
vsi->af_xdp_zc_qps = NULL;
326-
}
323+
bitmap_free(vsi->af_xdp_zc_qps);
324+
vsi->af_xdp_zc_qps = NULL;
327325
/* free the ring and vector containers */
328-
if (vsi->q_vectors) {
329-
devm_kfree(dev, vsi->q_vectors);
330-
vsi->q_vectors = NULL;
331-
}
332-
if (vsi->tx_rings) {
333-
devm_kfree(dev, vsi->tx_rings);
334-
vsi->tx_rings = NULL;
335-
}
336-
if (vsi->rx_rings) {
337-
devm_kfree(dev, vsi->rx_rings);
338-
vsi->rx_rings = NULL;
339-
}
340-
if (vsi->txq_map) {
341-
devm_kfree(dev, vsi->txq_map);
342-
vsi->txq_map = NULL;
343-
}
344-
if (vsi->rxq_map) {
345-
devm_kfree(dev, vsi->rxq_map);
346-
vsi->rxq_map = NULL;
347-
}
326+
devm_kfree(dev, vsi->q_vectors);
327+
vsi->q_vectors = NULL;
328+
devm_kfree(dev, vsi->tx_rings);
329+
vsi->tx_rings = NULL;
330+
devm_kfree(dev, vsi->rx_rings);
331+
vsi->rx_rings = NULL;
332+
devm_kfree(dev, vsi->txq_map);
333+
vsi->txq_map = NULL;
334+
devm_kfree(dev, vsi->rxq_map);
335+
vsi->rxq_map = NULL;
348336
}
349337

350338
/**
@@ -787,10 +775,8 @@ static void ice_rss_clean(struct ice_vsi *vsi)
787775

788776
dev = ice_pf_to_dev(pf);
789777

790-
if (vsi->rss_hkey_user)
791-
devm_kfree(dev, vsi->rss_hkey_user);
792-
if (vsi->rss_lut_user)
793-
devm_kfree(dev, vsi->rss_lut_user);
778+
devm_kfree(dev, vsi->rss_hkey_user);
779+
devm_kfree(dev, vsi->rss_lut_user);
794780

795781
ice_vsi_clean_rss_flow_fld(vsi);
796782
/* remove RSS replay list */

‎drivers/net/ethernet/intel/ice/ice_sched.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -353,10 +353,7 @@ void ice_free_sched_node(struct ice_port_info *pi, struct ice_sched_node *node)
353353
node->sibling;
354354
}
355355

356-
/* leaf nodes have no children */
357-
if (node->children)
358-
devm_kfree(ice_hw_to_dev(hw), node->children);
359-
356+
devm_kfree(ice_hw_to_dev(hw), node->children);
360357
kfree(node->name);
361358
xa_erase(&pi->sched_node_ids, node->id);
362359
devm_kfree(ice_hw_to_dev(hw), node);
@@ -854,10 +851,8 @@ void ice_sched_cleanup_all(struct ice_hw *hw)
854851
if (!hw)
855852
return;
856853

857-
if (hw->layer_info) {
858-
devm_kfree(ice_hw_to_dev(hw), hw->layer_info);
859-
hw->layer_info = NULL;
860-
}
854+
devm_kfree(ice_hw_to_dev(hw), hw->layer_info);
855+
hw->layer_info = NULL;
861856

862857
ice_sched_clear_port(hw->port_info);
863858

‎drivers/net/ethernet/intel/ice/ice_switch.c

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1636,21 +1636,16 @@ ice_save_vsi_ctx(struct ice_hw *hw, u16 vsi_handle, struct ice_vsi_ctx *vsi)
16361636
*/
16371637
static void ice_clear_vsi_q_ctx(struct ice_hw *hw, u16 vsi_handle)
16381638
{
1639-
struct ice_vsi_ctx *vsi;
1639+
struct ice_vsi_ctx *vsi = ice_get_vsi_ctx(hw, vsi_handle);
16401640
u8 i;
16411641

1642-
vsi = ice_get_vsi_ctx(hw, vsi_handle);
16431642
if (!vsi)
16441643
return;
16451644
ice_for_each_traffic_class(i) {
1646-
if (vsi->lan_q_ctx[i]) {
1647-
devm_kfree(ice_hw_to_dev(hw), vsi->lan_q_ctx[i]);
1648-
vsi->lan_q_ctx[i] = NULL;
1649-
}
1650-
if (vsi->rdma_q_ctx[i]) {
1651-
devm_kfree(ice_hw_to_dev(hw), vsi->rdma_q_ctx[i]);
1652-
vsi->rdma_q_ctx[i] = NULL;
1653-
}
1645+
devm_kfree(ice_hw_to_dev(hw), vsi->lan_q_ctx[i]);
1646+
vsi->lan_q_ctx[i] = NULL;
1647+
devm_kfree(ice_hw_to_dev(hw), vsi->rdma_q_ctx[i]);
1648+
vsi->rdma_q_ctx[i] = NULL;
16541649
}
16551650
}
16561651

@@ -5525,9 +5520,7 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups,
55255520
devm_kfree(ice_hw_to_dev(hw), fvit);
55265521
}
55275522

5528-
if (rm->root_buf)
5529-
devm_kfree(ice_hw_to_dev(hw), rm->root_buf);
5530-
5523+
devm_kfree(ice_hw_to_dev(hw), rm->root_buf);
55315524
kfree(rm);
55325525

55335526
err_free_lkup_exts:

0 commit comments

Comments
 (0)