ice: Add ice_get_main_vsi to get PF/main VSI

There are multiple places where we currently use ice_find_vsi_by_type
to get the PF (a.k.a. main) VSI. The PF VSI by definition is always
the first element in the pf->vsi array (i.e. pf->vsi[0]). So instead
add and use a new helper function ice_get_main_vsi, which just returns
pf->vsi[0].

Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
index fb2bc83..bbb3c29 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@ -425,21 +425,15 @@ ice_irq_dynamic_ena(struct ice_hw *hw, struct ice_vsi *vsi,
 }
 
 /**
- * ice_find_vsi_by_type - Find and return VSI of a given type
- * @pf: PF to search for VSI
- * @type: Value indicating type of VSI we are looking for
+ * ice_get_main_vsi - Get the PF VSI
+ * @pf: PF instance
+ *
+ * returns pf->vsi[0], which by definition is the PF VSI
  */
-static inline struct ice_vsi *
-ice_find_vsi_by_type(struct ice_pf *pf, enum ice_vsi_type type)
+static inline struct ice_vsi *ice_get_main_vsi(struct ice_pf *pf)
 {
-       int i;
-
-       for (i = 0; i < pf->num_alloc_vsi; i++) {
-               struct ice_vsi *vsi = pf->vsi[i];
-
-               if (vsi && vsi->type == type)
-                       return vsi;
-       }
+       if (pf->vsi)
+               return pf->vsi[0];
 
        return NULL;
 }

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 50a17a0..703fc7b 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -120,7 +120,7 @@ static int ice_init_mac_fltr(struct ice_pf *pf)
        u8 broadcast[ETH_ALEN];
        struct ice_vsi *vsi;
 
-       vsi = ice_find_vsi_by_type(pf, ICE_VSI_PF);
+       vsi = ice_get_main_vsi(pf);
        if (!vsi)
                return -EINVAL;
 
@@ -826,7 +826,7 @@ ice_link_event(struct ice_pf *pf, struct ice_port_info *pi, bool link_up,
        if (link_up == old_link && link_speed == old_link_speed)
                return result;
 
-       vsi = ice_find_vsi_by_type(pf, ICE_VSI_PF);
+       vsi = ice_get_main_vsi(pf);
        if (!vsi || !vsi->port_info)
                return -EINVAL;
 
@@ -1439,7 +1439,7 @@ static void ice_check_media_subtask(struct ice_pf *pf)
        struct ice_vsi *vsi;
        int err;
 
-       vsi = ice_find_vsi_by_type(pf, ICE_VSI_PF);
+       vsi = ice_get_main_vsi(pf);
        if (!vsi)
                return;