Commit 6f332353 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Tony Nguyen

ice: use devm_kcalloc() instead of devm_kzalloc()

Use 2-factor multiplication argument form devm_kcalloc() instead
of devm_kzalloc().

Link: https://github.com/KSPP/linux/issues/162Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 7c1b694a
...@@ -706,7 +706,7 @@ ice_create_init_fdir_rule(struct ice_pf *pf, enum ice_fltr_ptype flow) ...@@ -706,7 +706,7 @@ ice_create_init_fdir_rule(struct ice_pf *pf, enum ice_fltr_ptype flow)
if (!seg) if (!seg)
return -ENOMEM; return -ENOMEM;
tun_seg = devm_kzalloc(dev, sizeof(*seg) * ICE_FD_HW_SEG_MAX, tun_seg = devm_kcalloc(dev, sizeof(*seg), ICE_FD_HW_SEG_MAX,
GFP_KERNEL); GFP_KERNEL);
if (!tun_seg) { if (!tun_seg) {
devm_kfree(dev, seg); devm_kfree(dev, seg);
...@@ -1068,7 +1068,7 @@ ice_cfg_fdir_xtrct_seq(struct ice_pf *pf, struct ethtool_rx_flow_spec *fsp, ...@@ -1068,7 +1068,7 @@ ice_cfg_fdir_xtrct_seq(struct ice_pf *pf, struct ethtool_rx_flow_spec *fsp,
if (!seg) if (!seg)
return -ENOMEM; return -ENOMEM;
tun_seg = devm_kzalloc(dev, sizeof(*seg) * ICE_FD_HW_SEG_MAX, tun_seg = devm_kcalloc(dev, sizeof(*seg), ICE_FD_HW_SEG_MAX,
GFP_KERNEL); GFP_KERNEL);
if (!tun_seg) { if (!tun_seg) {
devm_kfree(dev, seg); devm_kfree(dev, seg);
......
...@@ -343,7 +343,7 @@ int ice_setup_tx_ring(struct ice_tx_ring *tx_ring) ...@@ -343,7 +343,7 @@ int ice_setup_tx_ring(struct ice_tx_ring *tx_ring)
/* warn if we are about to overwrite the pointer */ /* warn if we are about to overwrite the pointer */
WARN_ON(tx_ring->tx_buf); WARN_ON(tx_ring->tx_buf);
tx_ring->tx_buf = tx_ring->tx_buf =
devm_kzalloc(dev, sizeof(*tx_ring->tx_buf) * tx_ring->count, devm_kcalloc(dev, sizeof(*tx_ring->tx_buf), tx_ring->count,
GFP_KERNEL); GFP_KERNEL);
if (!tx_ring->tx_buf) if (!tx_ring->tx_buf)
return -ENOMEM; return -ENOMEM;
...@@ -475,7 +475,7 @@ int ice_setup_rx_ring(struct ice_rx_ring *rx_ring) ...@@ -475,7 +475,7 @@ int ice_setup_rx_ring(struct ice_rx_ring *rx_ring)
/* warn if we are about to overwrite the pointer */ /* warn if we are about to overwrite the pointer */
WARN_ON(rx_ring->rx_buf); WARN_ON(rx_ring->rx_buf);
rx_ring->rx_buf = rx_ring->rx_buf =
devm_kzalloc(dev, sizeof(*rx_ring->rx_buf) * rx_ring->count, devm_kcalloc(dev, sizeof(*rx_ring->rx_buf), rx_ring->count,
GFP_KERNEL); GFP_KERNEL);
if (!rx_ring->rx_buf) if (!rx_ring->rx_buf)
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment