]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
cxgb4: hide unused warnings
authorArnd Bergmann <arnd@arndb.de>
Wed, 18 Jan 2017 14:52:51 +0000 (15:52 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 20 Jan 2017 16:16:57 +0000 (11:16 -0500)
The two new variables are only used inside of an #ifdef and cause
harmless warnings when that is disabled:

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c: In function 'init_one':
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c:4646:9: error: unused variable 'port_vec' [-Werror=unused-variable]
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c:4646:6: error: unused variable 'v' [-Werror=unused-variable]

This adds another #ifdef around the declarations.

Fixes: 96fe11f27b70 ("cxgb4: Implement ndo_get_phys_port_id for mgmt dev")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

index 4da6f900ff246974a019a5bf5d0c2f982c9ee98a..49e000ebd2b9ce14a26d4b1d9dcaec9cb360d8b9 100644 (file)
@@ -4643,7 +4643,9 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        u32 whoami, pl_rev;
        enum chip_type chip;
        static int adap_idx = 1;
+#ifdef CONFIG_PCI_IOV
        u32 v, port_vec;
+#endif
 
        printk_once(KERN_INFO "%s - version %s\n", DRV_DESC, DRV_VERSION);