net: hns3: Fixes error reported by Kbuild and internal review
authorSalil Mehta <salil.mehta@huawei.com>
Sat, 19 May 2018 15:53:15 +0000 (16:53 +0100)
committerDavid S. Miller <davem@davemloft.net>
Sun, 20 May 2018 22:53:58 +0000 (18:53 -0400)
This patch fixes the error reported by Intel's kbuild and fixes a
return value in one of the legs, caught during review of the original
patch sent by kbuild.

Fixes: fdb793670a00 ("net: hns3: Add support of .sriov_configure in HNS3 driver")
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

index e85ff3805c96e1dc8ff9778fd3a1143f916cbc71..e75c65270222b8ad740c51caad53e8095a1d48ac 100644 (file)
@@ -1579,7 +1579,7 @@ static void hns3_remove(struct pci_dev *pdev)
  * Enable or change the number of VFs. Called when the user updates the number
  * of VFs in sysfs.
  **/
-int hns3_pci_sriov_configure(struct pci_dev *pdev, int num_vfs)
+static int hns3_pci_sriov_configure(struct pci_dev *pdev, int num_vfs)
 {
        int ret;
 
@@ -1592,6 +1592,8 @@ int hns3_pci_sriov_configure(struct pci_dev *pdev, int num_vfs)
                ret = pci_enable_sriov(pdev, num_vfs);
                if (ret)
                        dev_err(&pdev->dev, "SRIOV enable failed %d\n", ret);
+               else
+                       return num_vfs;
        } else if (!pci_vfs_assigned(pdev)) {
                pci_disable_sriov(pdev);
        } else {