From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756100AbcA2LlO (ORCPT ); Fri, 29 Jan 2016 06:41:14 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:64025 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755358AbcA2LlL (ORCPT ); Fri, 29 Jan 2016 06:41:11 -0500 From: Arnd Bergmann To: David Miller Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , netdev@vger.kernel.org, Jon Mason , linux-kernel@vger.kernel.org Subject: [PATCH v2 5/7] net: vxge: avoid unused function warnings Date: Fri, 29 Jan 2016 12:39:13 +0100 Message-Id: <1454067557-3546883-6-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454067557-3546883-1-git-send-email-arnd@arndb.de> References: <1454067557-3546883-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:EDTpTjybJ6+f3wzhAckzzjsJILlRsvnNpi+R8ol2n7RbNFttYjo wd0A2I0333kzlsbK1/6DNN2jMwl4maDnmAAEzb1hs+mocr34G88tTudk/wE2ohBz2TGrKfy OEv8uKuXdVkQpZINruXx7/WYBVK4ocva80+iSLrE9z3Yfz5x8yXyRalCj39gfFlr9laZdt1 2faMNVMxMEaBcmJb1VV7w== X-UI-Out-Filterresults: notjunk:1;V01:K0:mrFQo9VYYZE=:6nx3RwauYd/wt4auHpwM59 jVH08ScOhjtg6mNDu13s29zwXaccMWvs3j8lB4oysXJ7ADorYH1vb3nTdySZ0Iy6d57obah8L 1kGNIf5cSoRwHkepAQOwruMFLbko6BjODzB0YCGm1xY3LOVbrcYJTLR4+gJ0tVraSsaG2oDOh O6YfMMusI0MzeiJtFP9Tj5agmLMLZfw+JcykWtXVEidN7W1GI/v5BSQq257rZO3WzDyCt0KVK CdiPv8u0RLx75PivQNWHfAVc8XJfckJ2AtbbCdcRvgRT39ZO0ahf+xTMqqh26Bpwklgyvio9w UK3wmC+qBiVfq7B+KZKHk5FnB3Ff+w48Y5uFQ2T81s/LKImcjVrMbs9P4O1F+GSlZ0bWUnIlY WbGv5jKLEEhdV8jHnn1z8O/M0OIo8i9boLYS+ezDveUQW8YBd+SVehIxdpW/o58aj9MosjCbk +8cbq7RI8wT37vHLCRkcs2L91hfTNYGCpFmxhHvtsiORKz61ykH9VAO7hJOFUpaaTY/vB0sIk FvthkfTCL3zGlDpIvZatThdYRbNdBg53hM5wFaz6ATIBmeiAKDCgRDRcVNeB3hlfc9ikTEr0I 69Bzzy54XYYKEmgMSSOPlsqMsfc8H+/FKwmCEUCJSB+poQQJ1ef0HrVjnb18MpTIhCMD1QMYe Oj8Z/YaUmX1HcRhxdvxAByagBb72j7bITk5Cl+Y4wiBUuhFNGmWdTREyi1vaU0dHjzM0= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/net/ethernet/neterion/vxge/vxge-main.c | 31 ++++++++++---------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c index 50d5604833ed..e0993eba5df3 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c @@ -2223,8 +2223,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; @@ -2442,16 +2440,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); } @@ -2460,11 +2455,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) { @@ -2475,7 +2469,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++) { @@ -2576,9 +2570,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); @@ -3889,12 +3882,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) { -- 2.7.0