hns3: fix unused function warning

Without CONFIG_PCI_IOV, we get a harmless warning about an
unused function:

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c:2273:13: error: 'hclge_disable_sriov' defined but not used [-Werror=unused-function]

The #ifdefs in this driver are obviously wrong, so this just
removes them and uses an IS_ENABLED() check that does the same
thing correctly in a more readable way.

Fixes: 46a3df9f9718 ("net: hns3: Add HNS3 Acceleration Engine & Compatibility Layer Support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 3611991689bcea93ab778390b33b9a0d6f1136e7..7440e85b607cb75af4c0d212da4010835c4d57ec 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -2272,19 +2272,17 @@ static void hclge_service_task(struct work_struct *work)
 
 static void hclge_disable_sriov(struct hclge_dev *hdev)
 {
-#ifdef CONFIG_PCI_IOV
-               /* If our VFs are assigned we cannot shut down SR-IOV
-                * without causing issues, so just leave the hardware
-                * available but disabled
-                */
-               if (pci_vfs_assigned(hdev->pdev)) {
-                       dev_warn(&hdev->pdev->dev,
-                                "disabling driver while VFs are assigned\n");
-                       return;
-               }
+       /* If our VFs are assigned we cannot shut down SR-IOV
+        * without causing issues, so just leave the hardware
+        * available but disabled
+        */
+       if (pci_vfs_assigned(hdev->pdev)) {
+               dev_warn(&hdev->pdev->dev,
+                        "disabling driver while VFs are assigned\n");
+               return;
+       }
 
-               pci_disable_sriov(hdev->pdev);
-#endif
+       pci_disable_sriov(hdev->pdev);
 }
 
 struct hclge_vport *hclge_get_vport(struct hnae3_handle *handle)
@@ -4182,9 +4180,8 @@ static void hclge_uninit_ae_dev(struct hnae3_ae_dev *ae_dev)
 
        set_bit(HCLGE_STATE_DOWN, &hdev->state);
 
-#ifdef CONFIG_PCI_IOV
-       hclge_disable_sriov(hdev);
-#endif
+       if (IS_ENABLED(CONFIG_PCI_IOV))
+               hclge_disable_sriov(hdev);
 
        if (hdev->service_timer.data)
                del_timer_sync(&hdev->service_timer);