ice: clean up freeing SR-IOV VFs
authorPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Wed, 31 May 2023 12:36:42 +0000 (14:36 +0200)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Thu, 22 Jun 2023 17:29:31 +0000 (10:29 -0700)
The check for existing VFs was redundant since very
inception of SR-IOV sysfs interface in the kernel,
see commit 1789382a72a5 ("PCI: SRIOV control and status via sysfs").

Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
drivers/net/ethernet/intel/ice/ice_sriov.c

index 2ea6d24..1f66914 100644 (file)
@@ -905,14 +905,13 @@ err_unroll_intr:
  */
 static int ice_pci_sriov_ena(struct ice_pf *pf, int num_vfs)
 {
-       int pre_existing_vfs = pci_num_vf(pf->pdev);
        struct device *dev = ice_pf_to_dev(pf);
        int err;
 
-       if (pre_existing_vfs && pre_existing_vfs != num_vfs)
+       if (!num_vfs) {
                ice_free_vfs(pf);
-       else if (pre_existing_vfs && pre_existing_vfs == num_vfs)
                return 0;
+       }
 
        if (num_vfs > pf->vfs.num_supported) {
                dev_err(dev, "Can't enable %d VFs, max VFs supported is %d\n",