From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753044AbdHGKmt (ORCPT ); Mon, 7 Aug 2017 06:42:49 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:58066 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752795AbdHGKmr (ORCPT ); Mon, 7 Aug 2017 06:42:47 -0400 From: Arnd Bergmann To: Yisen Zhuang , Salil Mehta , "David S. Miller" Cc: Arnd Bergmann , "Wei Hu (Xavier)" , lipeng , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] hns3: fix unused function warning Date: Mon, 7 Aug 2017 12:41:53 +0200 Message-Id: <20170807104230.3564976-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:g2SCUroU3tOvc6Ruh/Z3myUzMs8Yq+3TRC8DHydN/+LOg/0uzyG BSaP4zRvzXC6JoF3Xdv4TuQgHPMyTINk5EVgdhMK5jjA96Qa9WogYfNKvfKuZMXxupO1K8k sB3yQaNWOfJLR5vNXH2arO4GPkoO/LBN5PTSXK/ZIFqBj6nKjjon8LHWnl334hz2E0o+Owy BhCzzumKPbda/IFsnVFYg== X-UI-Out-Filterresults: notjunk:1;V01:K0:J0kGxPzlPhU=:kgckmUE9fbuli5NpBEL6P8 +j18y6PbkxaPfNgGsXECQzdj/yD+U2u8ZWvclFVMPerr9ugccSD0IoBsGmtxbHSQ3Z6L0gJ3K KvJtCiW9YlTPMuDxbX/AkhZstdrXapoQOGaCV+81mkBQGwSW0gmtFxAjR9/Um5CjDYCsKKA6j NFgJ5ka1VABtGQLnxneaLUuMQ+GCZj3iljxwNaLRu5zcETsbN3g/4dTmUEr0XQfGY4MWoBkFC XDXQxTKJNVmm+wjZ8lkS8QcLxPVvsg5xyO4x2dflw2e7eHXXiaRiKVXbfHTdUIUKlx0WF7Ixg 3lseJsFuGS1yYPDulGK9XD4c0gOVuh9U7VEwqzT5oe8vBSQ5S9r98t6j95xo6ukzh2xz3jGyR y2PTRjxOzfvQUGKo/fPIB2wnuav83hAMUf1n+C1p4DGsUUKEmtKBCE7j0k6bS3YBMrmpoTBga HOLtrQTJu9aITvUqrPBZPeZEbEjMdMZDxHXC+T86DenypOw6EIJi3x3FV6EbVuvPkwtsBBjZC xoQ8WBjUfVhFDrU9ghyoMU3kO+HJOKHwDX0pm1WvUef0mWx9t/Jq/Qq/Asx8dnie5wYnDocC7 RLutDYjPQgkIvJCq5EZb5fabbhyc8xofu8lSpx4eiSVLWRyf0FCkNCv+aVFY02dQCGzyRtRlU ij4UQC1Ahr+r842sLmNTIKd6GY+LvIDt6hmX+RXbiEvYyKmUPHitgnKllEyoJJzXk9RjkWbE+ kVEfus67ydl0MN/yadyCPTBqmLRC2aCSvdr4ng== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 27 ++++++++++------------ 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 3611991689bc..7440e85b607c 100644 --- 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); -- 2.9.0