ice: Add more usage of existing function ice_get_vf_vsi(vf)

Extend the usage of function ice_get_vf_vsi(vf) in multiple places
instead of VF's VSI by using a long string of dereferences
(i.e. vf->pf->vsi[vf->lan_vsi_idx]).

Signed-off-by: Brett Creeley <brett.creeley@intel.com>
Signed-off-by: Kalyan Kodamagula <kalyan.kodamagula@intel.com>
Tested-by: Piotr Tyda <piotr.tyda@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c
index c6a58343d81d8e342b1d60dfef4b2bdaa770f24f..e6ef6b303222d17a5b15101ec6034738ef4bcb85 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c
@@ -113,7 +113,7 @@ ice_vc_fdir_param_check(struct ice_vf *vf, u16 vsi_id)
        if (!ice_vc_isvalid_vsi_id(vf, vsi_id))
                return -EINVAL;
 
-       if (!pf->vsi[vf->lan_vsi_idx])
+       if (!ice_get_vf_vsi(vf))
                return -EINVAL;
 
        return 0;
@@ -494,7 +494,7 @@ ice_vc_fdir_rem_prof(struct ice_vf *vf, enum ice_fltr_ptype flow, int tun)
 
        vf_prof = fdir->fdir_prof[flow];
 
-       vf_vsi = pf->vsi[vf->lan_vsi_idx];
+       vf_vsi = ice_get_vf_vsi(vf);
        if (!vf_vsi) {
                dev_dbg(dev, "NULL vf %d vsi pointer\n", vf->vf_id);
                return;
@@ -572,7 +572,7 @@ ice_vc_fdir_write_flow_prof(struct ice_vf *vf, enum ice_fltr_ptype flow,
        pf = vf->pf;
        dev = ice_pf_to_dev(pf);
        hw = &pf->hw;
-       vf_vsi = pf->vsi[vf->lan_vsi_idx];
+       vf_vsi = ice_get_vf_vsi(vf);
        if (!vf_vsi)
                return -EINVAL;
 
@@ -1205,7 +1205,7 @@ static int ice_vc_fdir_write_fltr(struct ice_vf *vf,
        pf = vf->pf;
        dev = ice_pf_to_dev(pf);
        hw = &pf->hw;
-       vsi = pf->vsi[vf->lan_vsi_idx];
+       vsi = ice_get_vf_vsi(vf);
        if (!vsi) {
                dev_dbg(dev, "Invalid vsi for VF %d\n", vf->vf_id);
                return -EINVAL;