Commit c6dfd690 authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

ice: sizeof(<type>) should be avoided 



With sizeof(), it is preferable to use the variable of type <type> instead
of sizeof(<type>).

There are multiple places where a temporary variable is used to hold a
'size' value which is then used for a subsequent alloc/memset. Get rid
of the temporary variable by calculating size as part of the alloc/memset
statement.

Also remove unnecessary type-cast.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 0e8fd74d

drivers/net/ethernet/intel/ice/ice_ethtool.c

+7 −8
Original line number Diff line number Diff line
@@ -1084,7 +1084,7 @@ ice_get_settings_link_up(struct ethtool_link_ksettings *ks, 
	 * current PHY type, get what is supported by the NVM and intersect

	 * them to get what is truly supported

	 */

	memset(&cap_ksettings, 0, sizeof(struct ethtool_link_ksettings));

	memset(&cap_ksettings, 0, sizeof(cap_ksettings));

	ice_phy_type_to_ethtool(netdev, &cap_ksettings);

	ethtool_intersect_link_masks(ks, &cap_ksettings);
@@ -1416,7 +1416,7 @@ ice_set_link_ksettings(struct net_device *netdev, 
		return -EOPNOTSUPP;



	/* copy the ksettings to copy_ks to avoid modifying the original */

	memcpy(&copy_ks, ks, sizeof(struct ethtool_link_ksettings));

	memcpy(&copy_ks, ks, sizeof(copy_ks));



	/* save autoneg out of ksettings */

	autoneg = copy_ks.base.autoneg;
@@ -1435,7 +1435,7 @@ ice_set_link_ksettings(struct net_device *netdev, 
		return -EINVAL;



	/* get our own copy of the bits to check against */

	memset(&safe_ks, 0, sizeof(struct ethtool_link_ksettings));

	memset(&safe_ks, 0, sizeof(safe_ks));

	safe_ks.base.cmd = copy_ks.base.cmd;

	safe_ks.base.link_mode_masks_nwords =

		copy_ks.base.link_mode_masks_nwords;
@@ -1449,8 +1449,7 @@ ice_set_link_ksettings(struct net_device *netdev, 
	/* If copy_ks.base and safe_ks.base are not the same now, then they are

	 * trying to set something that we do not support.

	 */

	if (memcmp(&copy_ks.base, &safe_ks.base,

		   sizeof(struct ethtool_link_settings)))

	if (memcmp(&copy_ks.base, &safe_ks.base, sizeof(copy_ks.base)))

		return -EOPNOTSUPP;



	while (test_and_set_bit(__ICE_CFG_BUSY, pf->state)) {
@@ -1474,7 +1473,7 @@ ice_set_link_ksettings(struct net_device *netdev, 
	}



	/* Copy abilities to config in case autoneg is not set below */

	memset(&config, 0, sizeof(struct ice_aqc_set_phy_cfg_data));

	memset(&config, 0, sizeof(config));

	config.caps = abilities->caps & ~ICE_AQC_PHY_AN_MODE;

	if (abilities->caps & ICE_AQC_PHY_AN_MODE)

		config.caps |= ICE_AQ_PHY_ENA_AUTO_LINK_UPDT;
@@ -1668,7 +1667,7 @@ ice_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring) 
		    vsi->tx_rings[0]->count, new_tx_cnt);



	tx_rings = devm_kcalloc(&pf->pdev->dev, vsi->alloc_txq,

				sizeof(struct ice_ring), GFP_KERNEL);

				sizeof(*tx_rings), GFP_KERNEL);

	if (!tx_rings) {

		err = -ENOMEM;

		goto done;
@@ -1700,7 +1699,7 @@ process_rx: 
		    vsi->rx_rings[0]->count, new_rx_cnt);



	rx_rings = devm_kcalloc(&pf->pdev->dev, vsi->alloc_rxq,

				sizeof(struct ice_ring), GFP_KERNEL);

				sizeof(*rx_rings), GFP_KERNEL);

	if (!rx_rings) {

		err = -ENOMEM;

		goto done;

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

+5 −5
Original line number Diff line number Diff line
@@ -249,12 +249,12 @@ static int ice_vsi_alloc_arrays(struct ice_vsi *vsi, bool alloc_qvectors) 


	/* allocate memory for both Tx and Rx ring pointers */

	vsi->tx_rings = devm_kcalloc(&pf->pdev->dev, vsi->alloc_txq,

				     sizeof(struct ice_ring *), GFP_KERNEL);

				     sizeof(*vsi->tx_rings), GFP_KERNEL);

	if (!vsi->tx_rings)

		goto err_txrings;



	vsi->rx_rings = devm_kcalloc(&pf->pdev->dev, vsi->alloc_rxq,

				     sizeof(struct ice_ring *), GFP_KERNEL);

				     sizeof(*vsi->rx_rings), GFP_KERNEL);

	if (!vsi->rx_rings)

		goto err_rxrings;
@@ -262,7 +262,7 @@ static int ice_vsi_alloc_arrays(struct ice_vsi *vsi, bool alloc_qvectors) 
		/* allocate memory for q_vector pointers */

		vsi->q_vectors = devm_kcalloc(&pf->pdev->dev,

					      vsi->num_q_vectors,

					      sizeof(struct ice_q_vector *),

					      sizeof(*vsi->q_vectors),

					      GFP_KERNEL);

		if (!vsi->q_vectors)

			goto err_vectors;
@@ -355,7 +355,7 @@ void ice_vsi_delete(struct ice_vsi *vsi) 
		ctxt.vf_num = vsi->vf_id;

	ctxt.vsi_num = vsi->vsi_num;



	memcpy(&ctxt.info, &vsi->info, sizeof(struct ice_aqc_vsi_props));

	memcpy(&ctxt.info, &vsi->info, sizeof(ctxt.info));



	status = ice_free_vsi(&pf->hw, vsi->idx, &ctxt, false, NULL);

	if (status)
@@ -1620,7 +1620,7 @@ ice_vsi_cfg_txqs(struct ice_vsi *vsi, struct ice_ring **rings, int offset) 
	u16 buf_len, i, pf_q;

	int err = 0, tc;



	buf_len = sizeof(struct ice_aqc_add_tx_qgrp);

	buf_len = sizeof(*qg_buf);

	qg_buf = devm_kzalloc(&pf->pdev->dev, buf_len, GFP_KERNEL);

	if (!qg_buf)

		return -ENOMEM;

drivers/net/ethernet/intel/ice/ice_main.c

+11 −12
Original line number Diff line number Diff line
@@ -1513,8 +1513,8 @@ static int ice_cfg_netdev(struct ice_vsi *vsi) 
	u8 mac_addr[ETH_ALEN];

	int err;



	netdev = alloc_etherdev_mqs(sizeof(struct ice_netdev_priv),

				    vsi->alloc_txq, vsi->alloc_rxq);

	netdev = alloc_etherdev_mqs(sizeof(*np), vsi->alloc_txq,

				    vsi->alloc_rxq);

	if (!netdev)

		return -ENOMEM;
@@ -1867,7 +1867,7 @@ static int ice_ena_msix_range(struct ice_pf *pf) 
	v_left -= pf->num_lan_msix;



	pf->msix_entries = devm_kcalloc(&pf->pdev->dev, v_budget,

					sizeof(struct msix_entry), GFP_KERNEL);

					sizeof(*pf->msix_entries), GFP_KERNEL);



	if (!pf->msix_entries) {

		err = -ENOMEM;
@@ -1955,7 +1955,6 @@ static void ice_clear_interrupt_scheme(struct ice_pf *pf) 
static int ice_init_interrupt_scheme(struct ice_pf *pf)

{

	int vectors = 0, hw_vectors = 0;

	ssize_t size;



	if (test_bit(ICE_FLAG_MSIX_ENA, pf->flags))

		vectors = ice_ena_msix_range(pf);
@@ -1966,9 +1965,9 @@ static int ice_init_interrupt_scheme(struct ice_pf *pf) 
		return vectors;



	/* set up vector assignment tracking */

	size = sizeof(struct ice_res_tracker) + (sizeof(u16) * vectors);



	pf->sw_irq_tracker = devm_kzalloc(&pf->pdev->dev, size, GFP_KERNEL);

	pf->sw_irq_tracker =

		devm_kzalloc(&pf->pdev->dev, sizeof(*pf->sw_irq_tracker) +

			     (sizeof(u16) * vectors), GFP_KERNEL);

	if (!pf->sw_irq_tracker) {

		ice_dis_msix(pf);

		return -ENOMEM;
@@ -1980,9 +1979,9 @@ static int ice_init_interrupt_scheme(struct ice_pf *pf) 


	/* set up HW vector assignment tracking */

	hw_vectors = pf->hw.func_caps.common_cap.num_msix_vectors;

	size = sizeof(struct ice_res_tracker) + (sizeof(u16) * hw_vectors);



	pf->hw_irq_tracker = devm_kzalloc(&pf->pdev->dev, size, GFP_KERNEL);

	pf->hw_irq_tracker =

		devm_kzalloc(&pf->pdev->dev, sizeof(*pf->hw_irq_tracker) +

			     (sizeof(u16) * hw_vectors), GFP_KERNEL);

	if (!pf->hw_irq_tracker) {

		ice_clear_interrupt_scheme(pf);

		return -ENOMEM;
@@ -2116,7 +2115,7 @@ static int ice_probe(struct pci_dev *pdev, 
	}



	pf->vsi = devm_kcalloc(&pdev->dev, pf->num_alloc_vsi,

			       sizeof(struct ice_vsi *), GFP_KERNEL);

			       sizeof(*pf->vsi), GFP_KERNEL);

	if (!pf->vsi) {

		err = -ENOMEM;

		goto err_init_pf_unroll;
@@ -2148,7 +2147,7 @@ static int ice_probe(struct pci_dev *pdev, 
	}



	/* create switch struct for the switch element created by FW on boot */

	pf->first_sw = devm_kzalloc(&pdev->dev, sizeof(struct ice_sw),

	pf->first_sw = devm_kzalloc(&pdev->dev, sizeof(*pf->first_sw),

				    GFP_KERNEL);

	if (!pf->first_sw) {

		err = -ENOMEM;

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

+4 −5
Original line number Diff line number Diff line
@@ -1066,8 +1066,7 @@ enum ice_status ice_sched_query_res_alloc(struct ice_hw *hw) 
		hw->max_children[i] = le16_to_cpu(max_sibl);

	}



	hw->layer_info = (struct ice_aqc_layer_props *)

			  devm_kmemdup(ice_hw_to_dev(hw), buf->layer_props,

	hw->layer_info = devm_kmemdup(ice_hw_to_dev(hw), buf->layer_props,

				      (hw->num_tx_sched_layers *

				       sizeof(*hw->layer_info)),

				      GFP_KERNEL);

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

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ enum ice_status ice_init_def_sw_recp(struct ice_hw *hw) 
	u8 i;



	recps = devm_kcalloc(ice_hw_to_dev(hw), ICE_MAX_NUM_RECIPES,

			     sizeof(struct ice_sw_recipe), GFP_KERNEL);

			     sizeof(*recps), GFP_KERNEL);

	if (!recps)

		return ICE_ERR_NO_MEMORY;

CRA Git | Maintained and supported by SUSTech CRA and CCSE