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/162
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c b/drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c
index 16de603b280c6e77ab9959c8a16fe0930fa4fe47..38960bcc384c03f94439977feefb27cdb96aff7a 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c
@@ -706,7 +706,7 @@ ice_create_init_fdir_rule(struct ice_pf *pf, enum ice_fltr_ptype flow)
        if (!seg)
                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);
        if (!tun_seg) {
                devm_kfree(dev, seg);
@@ -1068,7 +1068,7 @@ ice_cfg_fdir_xtrct_seq(struct ice_pf *pf, struct ethtool_rx_flow_spec *fsp,
        if (!seg)
                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);
        if (!tun_seg) {
                devm_kfree(dev, seg);

diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c
index 8f908af9bdd594dc69a67c85fe67908fff89a806..bc3ba19dc88f8a79de13cb7b61e4f900eeec347a 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_txrx.c
+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c
@@ -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_ON(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);
        if (!tx_ring->tx_buf)
                return -ENOMEM;
@@ -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_ON(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);
        if (!rx_ring->rx_buf)
                return -ENOMEM;