From patchwork Fri May 5 19:47:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98689 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292815qge; Fri, 5 May 2017 12:48:37 -0700 (PDT) X-Received: by 10.99.115.14 with SMTP id o14mr5212276pgc.31.1494013717805; Fri, 05 May 2017 12:48:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494013717; cv=none; d=google.com; s=arc-20160816; b=wsGqUupZarXy+Ct8J/zjjLtdUKSe4VyfDi+dhX7pdhFmTUOsUkVmpIwUQ6K7x6FFj9 CCuLL557Eoi0dqjAs9Qfxc8JI5ZAnFXxkiaj8PcN0czHWIr4KGQAqUC+GFxdU2eUqx5v P3YKlgjLVSq1JNZVpfCoEAOv/Mm3S16eLHjw2+qPYapSdxyQeRjf5KTC44KaSrJb/5oU XRsqISPfEcQA55jizI7GVMSG0sOoQgdhTJgNYnXQagNRfFkQY+h+gLXbwC375GtpT1Uh tx8bWtCBXvqqt+AotaeKAyo+FDcaYWR6XsyXn0H7BMlO5A5Jv0EfEIu8d0H9bIBsIrDh SUAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=nZ8fwT5V/pIN25etywuaJhUcQ96yU+D7iMLaRpleqmE=; b=cCZ/aSBiyevOkUQfHscgqBME2dRLELE1lSNWjGoIMt8y5smS83bH0RRH+vbL5zW49i FHF8oivyq5qQTYHZDMpfnGVQffP4g57kxLKvsAWXAADS2aJdct+t7vbwl7X0uscemtdb vdC94pKe27H/wK2DkU835tIdfn+GazWo1ISawJ7z3KbvmOba/2MWfuNvaAebwEU7Ccv5 vQcBOG4WaaJkhTds1EQtTww+M52HyxbPkK1EOvUs3jet45RSUsMZaVl9vSIk8tyI9949 1wBCleXlvY/MOBtj7XcOzMSKlYoD5rAjpJYwAdsx6se/suMlALCDXXADiJx243CFVJyI axGA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.37; Fri, 05 May 2017 12:48:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752379AbdEETsg (ORCPT + 6 others); Fri, 5 May 2017 15:48:36 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:55224 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755479AbdEETsa (ORCPT ); Fri, 5 May 2017 15:48:30 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LmzQD-1dh9Ma48J3-00hO7s; Fri, 05 May 2017 21:48:26 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , "David S . Miller" Subject: [PATCH 3.16-stable 53/87] net: vxge: avoid unused function warnings Date: Fri, 5 May 2017 21:47:11 +0200 Message-Id: <20170505194745.3627137-54-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:YQDBYtf/GLk0SdViCYLWVcgHapOt7hxE6wZtro0SPC0qfryhJ9s yEiPW9IIj6OI9NLtFRS3vYtChL8Vrk+nwCp+3S5PED9XQV5JkRzFvC//lTI98muDJhbdeMq QiFOeVp3QAV1PHo263RTPMMEqfM586myLvcZK+G3V4a5Dp2Y73pz86j8Z8ywndCO7sMrj4n xahKXc4MULaZSTpyKE6gA== X-UI-Out-Filterresults: notjunk:1; V01:K0:qHN/9FSXL5w=:rggTeyTEL7+2JG16O28koJ ZUmC+C2PoCL0cUnxv4RaMFXaCHkaZ1COybLefLnxhkc+47aWGDQsrn2O6y+NS/5BJVJ5e9iYS EGXfs2JClPXpqcfSyAAq7y0nwodJFthKCq+iptz0X0Kj9330AeWMvzOy0f2WEkLtgl14zwDAi QHPf2szQjr6vSlB9xaH9X1sT1NFbemWHEgkSX+z316wtYNQEV1rx4vS14BSmhiHaGl2ef+oZy 1fGehkYHV9AcfCSH+ZR6myc8JlWvavj0gsdh8dz6PRKfD0GT94f6OsUsA7i3EwM52L3mTyn0D VanROUkVB7fpoTHIMB2ugu1eu9NgbnpCvkokoykViIflbPViDc9FiDl8k0Y1pMna3vUtHcnu8 EUWGXbWx0DE1W0CtYNjYCQGqZyN3yovx8cELnOnODuR7p3lV4Ff4R1WXc7Nw3ZFeGFHA9+njJ PvmCkegxMUvfJC8+faFwoh3yMIQye7XkobxG2BepGhnYcWvHkWJGaJQJ5Pi60fjImP5M6iISk dIfFn1eywZvDpPe92hKrqYaMZDGWCb+Iehw9RH6T9J9jopG63g6HGa2Pm4uCVUKLYhgAk1hQ8 HuLu1Q0GU3ydDa0mqPzE5geAe3TDbnC0sr9m3sz+pIiKqghbSB1D3frqHjp4CQ0TV1Pu6B6Yc KAhj4gJLPbtk83of5r6vr6I8wj3DvNJMperhCNdvnMRuc/mT0pSJMLA3OHe/REVj6G+U= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit 77e1adc8f41be3e2d44ca335814e8a78920f319a upstream. When CONFIG_PCI_MSI is disabled, we get warnings about unused functions in the vxge driver: drivers/net/ethernet/neterion/vxge/vxge-main.c:2121:13: warning: 'adaptive_coalesce_tx_interrupts' defined but not used [-Wunused-function] drivers/net/ethernet/neterion/vxge/vxge-main.c:2149:13: warning: 'adaptive_coalesce_rx_interrupts' defined but not used [-Wunused-function] We could add another #ifdef here, but it's nicer to avoid those warnings for good by converting the existing #ifdef to if(IS_ENABLED()), which has the same effect but provides better compile-time coverage in general, and lets the compiler understand better when the function is intentionally unused. Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/neterion/vxge/vxge-main.c | 31 ++++++++++---------------- 1 file changed, 12 insertions(+), 19 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c index 7a0deadd53bf..75682df75c89 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c @@ -2224,8 +2224,6 @@ static irqreturn_t vxge_isr_napi(int irq, void *dev_id) return IRQ_NONE; } -#ifdef CONFIG_PCI_MSI - static irqreturn_t vxge_tx_msix_handle(int irq, void *dev_id) { struct vxge_fifo *fifo = (struct vxge_fifo *)dev_id; @@ -2443,16 +2441,13 @@ static void vxge_rem_msix_isr(struct vxgedev *vdev) if (vdev->config.intr_type == MSI_X) pci_disable_msix(vdev->pdev); } -#endif static void vxge_rem_isr(struct vxgedev *vdev) { -#ifdef CONFIG_PCI_MSI - if (vdev->config.intr_type == MSI_X) { + if (IS_ENABLED(CONFIG_PCI_MSI) && + vdev->config.intr_type == MSI_X) { vxge_rem_msix_isr(vdev); - } else -#endif - if (vdev->config.intr_type == INTA) { + } else if (vdev->config.intr_type == INTA) { synchronize_irq(vdev->pdev->irq); free_irq(vdev->pdev->irq, vdev); } @@ -2461,11 +2456,10 @@ static void vxge_rem_isr(struct vxgedev *vdev) static int vxge_add_isr(struct vxgedev *vdev) { int ret = 0; -#ifdef CONFIG_PCI_MSI int vp_idx = 0, intr_idx = 0, intr_cnt = 0, msix_idx = 0, irq_req = 0; int pci_fun = PCI_FUNC(vdev->pdev->devfn); - if (vdev->config.intr_type == MSI_X) + if (IS_ENABLED(CONFIG_PCI_MSI) && vdev->config.intr_type == MSI_X) ret = vxge_enable_msix(vdev); if (ret) { @@ -2476,7 +2470,7 @@ static int vxge_add_isr(struct vxgedev *vdev) vdev->config.intr_type = INTA; } - if (vdev->config.intr_type == MSI_X) { + if (IS_ENABLED(CONFIG_PCI_MSI) && vdev->config.intr_type == MSI_X) { for (intr_idx = 0; intr_idx < (vdev->no_of_vpath * VXGE_HW_VPATH_MSIX_ACTIVE); intr_idx++) { @@ -2577,9 +2571,8 @@ static int vxge_add_isr(struct vxgedev *vdev) vdev->vxge_entries[intr_cnt].in_use = 1; vdev->vxge_entries[intr_cnt].arg = &vdev->vpaths[0]; } -INTA_MODE: -#endif +INTA_MODE: if (vdev->config.intr_type == INTA) { snprintf(vdev->desc[0], VXGE_INTR_STRLEN, "%s:vxge:INTA", vdev->ndev->name); @@ -3890,12 +3883,12 @@ static void vxge_device_config_init(struct vxge_hw_device_config *device_config, if (max_mac_vpath > VXGE_MAX_MAC_ADDR_COUNT) max_mac_vpath = VXGE_MAX_MAC_ADDR_COUNT; -#ifndef CONFIG_PCI_MSI - vxge_debug_init(VXGE_ERR, - "%s: This Kernel does not support " - "MSI-X. Defaulting to INTA", VXGE_DRIVER_NAME); - *intr_type = INTA; -#endif + if (!IS_ENABLED(CONFIG_PCI_MSI)) { + vxge_debug_init(VXGE_ERR, + "%s: This Kernel does not support " + "MSI-X. Defaulting to INTA", VXGE_DRIVER_NAME); + *intr_type = INTA; + } /* Configure whether MSI-X or IRQL. */ switch (*intr_type) {