Commit 4bdf5f25 authored by Jacob Keller's avatar Jacob Keller Committed by Tony Nguyen
Browse files

ice: remove ice_mbx_deinit_snapshot 



The ice_mbx_deinit_snapshot function's only remaining job is to clear the
previous snapshot data. This snapshot data is initialized when SR-IOV adds
VFs, so it is not necessary to clear this data when removing VFs. Since no
allocation occurs we no longer need to free anything and we can safely
remove this function.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: default avatarMarek Szlosek <marek.szlosek@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 8cd8a6b1

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

+1 −4
Original line number Diff line number Diff line
@@ -1014,7 +1014,6 @@ int ice_sriov_configure(struct pci_dev *pdev, int num_vfs) 
	if (!num_vfs) {

		if (!pci_vfs_assigned(pdev)) {

			ice_free_vfs(pf);

			ice_mbx_deinit_snapshot(&pf->hw);

			if (pf->lag)

				ice_enable_lag(pf->lag);

			return 0;
@@ -1027,10 +1026,8 @@ int ice_sriov_configure(struct pci_dev *pdev, int num_vfs) 
	ice_mbx_init_snapshot(&pf->hw);



	err = ice_pci_sriov_ena(pf, num_vfs);

	if (err) {

		ice_mbx_deinit_snapshot(&pf->hw);

	if (err)

		return err;

	}



	if (pf->lag)

		ice_disable_lag(pf->lag);

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

+0 −14
Original line number Diff line number Diff line
@@ -399,17 +399,3 @@ void ice_mbx_init_snapshot(struct ice_hw *hw) 
	INIT_LIST_HEAD(&snap->mbx_vf);

	ice_mbx_reset_snapshot(snap);

}
 


/**

 * ice_mbx_deinit_snapshot - Free mailbox snapshot structure

 * @hw: pointer to the hardware structure

 *

 * Clear the mailbox snapshot structure and free the VF counter array.

 */

void ice_mbx_deinit_snapshot(struct ice_hw *hw)

{

	struct ice_mbx_snapshot *snap = &hw->mbx_snapshot;



	/* Clear mbx_buf in the mailbox snaphot structure */

	memset(&snap->mbx_buf, 0, sizeof(snap->mbx_buf));

}

drivers/net/ethernet/intel/ice/ice_vf_mbx.h

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ ice_mbx_vf_state_handler(struct ice_hw *hw, struct ice_mbx_data *mbx_data, 
void ice_mbx_clear_malvf(struct ice_mbx_vf_info *vf_info);

void ice_mbx_init_vf_info(struct ice_hw *hw, struct ice_mbx_vf_info *vf_info);

void ice_mbx_init_snapshot(struct ice_hw *hw);

void ice_mbx_deinit_snapshot(struct ice_hw *hw);

int

ice_mbx_report_malvf(struct ice_hw *hw, struct ice_mbx_vf_info *vf_info,

		     bool *report_malvf);