UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ice: make ice_reset_all_vfs void 

The ice_reset_all_vfs function returns true if any VFs were reset, and
false otherwise. However, no callers check the return value.

Drop this return value and make the function void since the callers do
not care about this.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Konrad Jankowski <konrad0.jankowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
This commit is contained in:
Jacob Keller 2022-02-22 16:27:05 -08:00 committed by Tony Nguyen
parent dac5728875
commit fe99d1c06c
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/intel/ice/ice_vf_lib.c
View File

@ -364,7 +364,7 @@ ice_vf_clear_vsi_promisc(struct ice_vf *vf, struct ice_vsi *vsi, u8 promisc_m)
*
* Returns true if any VFs were reset, and false otherwise.
*/
bool ice_reset_all_vfs(struct ice_pf *pf)
void ice_reset_all_vfs(struct ice_pf *pf)
{
struct device *dev = ice_pf_to_dev(pf);
struct ice_hw *hw = &pf->hw;
@ -373,7 +373,7 @@ bool ice_reset_all_vfs(struct ice_pf *pf)
/* If we don't have any VFs, then there is nothing to reset */
if (!ice_has_vfs(pf))
return false;
return;
mutex_lock(&pf->vfs.table_lock);
@ -387,7 +387,7 @@ bool ice_reset_all_vfs(struct ice_pf *pf)
/* If VFs have been disabled, there is no need to reset */
if (test_and_set_bit(ICE_VF_DIS, pf->state)) {
mutex_unlock(&pf->vfs.table_lock);
return false;
return;
}
/* Begin reset on all VFs at once */
@ -439,8 +439,6 @@ bool ice_reset_all_vfs(struct ice_pf *pf)
clear_bit(ICE_VF_DIS, pf->state);
mutex_unlock(&pf->vfs.table_lock);
return true;
}
/**

5
drivers/net/ethernet/intel/ice/ice_vf_lib.h
View File

@ -213,7 +213,7 @@ ice_vf_set_vsi_promisc(struct ice_vf *vf, struct ice_vsi *vsi, u8 promisc_m);
int
ice_vf_clear_vsi_promisc(struct ice_vf *vf, struct ice_vsi *vsi, u8 promisc_m);
bool ice_reset_vf(struct ice_vf *vf, bool is_vflr);
bool ice_reset_all_vfs(struct ice_pf *pf);
void ice_reset_all_vfs(struct ice_pf *pf);
#else /* CONFIG_PCI_IOV */
static inline struct ice_vf *ice_get_vf_by_id(struct ice_pf *pf, u16 vf_id)
{
@ -275,9 +275,8 @@ static inline bool ice_reset_vf(struct ice_vf *vf, bool is_vflr)
return true;
}
static inline bool ice_reset_all_vfs(struct ice_pf *pf)
static inline void ice_reset_all_vfs(struct ice_pf *pf)
{
return true;
}
#endif /* !CONFIG_PCI_IOV */