Prefer structure assignment over memcpy. Found by struct-assign.cocci. Signed-off-by: Stephen Hemminger <step...@networkplumber.org> --- drivers/net/intel/i40e/i40e_ethdev.c | 6 ++---- drivers/net/intel/i40e/i40e_fdir.c | 3 +-- drivers/net/intel/i40e/i40e_flow.c | 3 +-- drivers/net/intel/i40e/rte_pmd_i40e.c | 3 +-- drivers/net/intel/ixgbe/ixgbe_flow.c | 4 +--- 5 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/drivers/net/intel/i40e/i40e_ethdev.c b/drivers/net/intel/i40e/i40e_ethdev.c index bf5560ccc8..8a7afd6dbe 100644 --- a/drivers/net/intel/i40e/i40e_ethdev.c +++ b/drivers/net/intel/i40e/i40e_ethdev.c @@ -5987,8 +5987,7 @@ i40e_vsi_setup(struct i40e_pf *pf, PMD_DRV_LOG(ERR, "Failed to get VSI params"); goto fail_msix_alloc; } - rte_memcpy(&vsi->info, &ctxt.info, - sizeof(struct i40e_aqc_vsi_properties_data)); + vsi->info = ctxt.info; vsi->vsi_id = ctxt.vsi_number; vsi->info.valid_sections = 0; @@ -6005,8 +6004,7 @@ i40e_vsi_setup(struct i40e_pf *pf, rte_cpu_to_le_16(I40E_AQ_VSI_PROP_VLAN_VALID); vsi->info.port_vlan_flags = I40E_AQ_VSI_PVLAN_MODE_ALL | I40E_AQ_VSI_PVLAN_EMOD_STR_BOTH; - rte_memcpy(&ctxt.info, &vsi->info, - sizeof(struct i40e_aqc_vsi_properties_data)); + ctxt.info = vsi->info; ret = i40e_vsi_config_tc_queue_mapping(vsi, &ctxt.info, I40E_DEFAULT_TCMAP); if (ret != I40E_SUCCESS) { diff --git a/drivers/net/intel/i40e/i40e_fdir.c b/drivers/net/intel/i40e/i40e_fdir.c index 349627a2ed..3d0ba25cba 100644 --- a/drivers/net/intel/i40e/i40e_fdir.c +++ b/drivers/net/intel/i40e/i40e_fdir.c @@ -1252,8 +1252,7 @@ i40e_flow_store_flex_mask(struct i40e_pf *pf, sizeof(struct i40e_fdir_flex_mask)))) return 1; - memcpy(&pf->fdir.flex_mask[pctype], &flex_mask, - sizeof(struct i40e_fdir_flex_mask)); + pf->fdir.flex_mask[pctype] = flex_mask; return 0; } diff --git a/drivers/net/intel/i40e/i40e_flow.c b/drivers/net/intel/i40e/i40e_flow.c index cd598431e1..f130f53ae0 100644 --- a/drivers/net/intel/i40e/i40e_flow.c +++ b/drivers/net/intel/i40e/i40e_flow.c @@ -2364,8 +2364,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, next_dst_off += raw_spec->length; raw_id++; - memcpy(&filter->input.flow_ext.flex_pit[field_idx], - &flex_pit, sizeof(struct i40e_fdir_flex_pit)); + filter->input.flow_ext.flex_pit[field_idx] = flex_pit; filter->input.flow_ext.layer_idx = layer_idx; filter->input.flow_ext.raw_id = raw_id; filter->input.flow_ext.is_flex_flow = true; diff --git a/drivers/net/intel/i40e/rte_pmd_i40e.c b/drivers/net/intel/i40e/rte_pmd_i40e.c index 9d39984ea1..e620731199 100644 --- a/drivers/net/intel/i40e/rte_pmd_i40e.c +++ b/drivers/net/intel/i40e/rte_pmd_i40e.c @@ -2961,8 +2961,7 @@ i40e_queue_region_get_all_info(struct i40e_pf *pf, { struct i40e_queue_regions *info = &pf->queue_region; - rte_memcpy(regions_ptr, info, - sizeof(struct i40e_queue_regions)); + *regions_ptr = *info; return 0; } diff --git a/drivers/net/intel/ixgbe/ixgbe_flow.c b/drivers/net/intel/ixgbe/ixgbe_flow.c index 33da2f47ec..be8f3072fb 100644 --- a/drivers/net/intel/ixgbe/ixgbe_flow.c +++ b/drivers/net/intel/ixgbe/ixgbe_flow.c @@ -3142,9 +3142,7 @@ ixgbe_flow_create(struct rte_eth_dev *dev, if (fdir_rule.b_mask) { if (!fdir_info->mask_added) { /* It's the first time the mask is set. */ - rte_memcpy(&fdir_info->mask, - &fdir_rule.mask, - sizeof(struct ixgbe_hw_fdir_mask)); + *&fdir_info->mask = *&fdir_rule.mask; if (fdir_rule.mask.flex_bytes_mask) { ret = ixgbe_fdir_set_flexbytes_offset(dev, -- 2.47.2