ixgbe: Resolve warnings produced in W=2 builds

This patch resolves warnings produced by ixgbe in W=2 kernel
builds. There are missing-field-initializers warnings and shadow
warnings. None of these point to any deeper problem, so just
resolve them so any new warnings get analyzed.

Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index e4100b5737b67a3cb862428e120e67d51bd1b7fd..cff383b1cbb04d7ebeb9f696b94ad4caeaf7921e 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -1303,7 +1303,7 @@ static const struct ixgbe_reg_test reg_test_82599[] = {
        { IXGBE_RAL(0), 16, TABLE64_TEST_LO, 0xFFFFFFFF, 0xFFFFFFFF },
        { IXGBE_RAL(0), 16, TABLE64_TEST_HI, 0x8001FFFF, 0x800CFFFF },
        { IXGBE_MTA(0), 128, TABLE32_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { 0, 0, 0, 0 }
+       { .reg = 0 }
 };
 
 /* default 82598 register test */
@@ -1331,7 +1331,7 @@ static const struct ixgbe_reg_test reg_test_82598[] = {
        { IXGBE_RAL(0), 16, TABLE64_TEST_LO, 0xFFFFFFFF, 0xFFFFFFFF },
        { IXGBE_RAL(0), 16, TABLE64_TEST_HI, 0x800CFFFF, 0x800CFFFF },
        { IXGBE_MTA(0), 128, TABLE32_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
-       { 0, 0, 0, 0 }
+       { .reg = 0 }
 };
 
 static bool reg_pattern_test(struct ixgbe_adapter *adapter, u64 *data, int reg,

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 166dc0015a5e91b21ff2d03ac8cf7764732ecbdd..87613806ee880b66560a0b6279d61d652481f142 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -440,7 +440,7 @@ static const struct ixgbe_reg_info ixgbe_reg_info_tbl[] = {
        {IXGBE_TXDCTL(0), "TXDCTL"},
 
        /* List Terminator */
-       {}
+       { .name = NULL }
 };
 
 
@@ -5186,15 +5186,15 @@ int ixgbe_setup_tx_resources(struct ixgbe_ring *tx_ring)
 {
        struct device *dev = tx_ring->dev;
        int orig_node = dev_to_node(dev);
-       int numa_node = -1;
+       int ring_node = -1;
        int size;
 
        size = sizeof(struct ixgbe_tx_buffer) * tx_ring->count;
 
        if (tx_ring->q_vector)
-               numa_node = tx_ring->q_vector->numa_node;
+               ring_node = tx_ring->q_vector->numa_node;
 
-       tx_ring->tx_buffer_info = vzalloc_node(size, numa_node);
+       tx_ring->tx_buffer_info = vzalloc_node(size, ring_node);
        if (!tx_ring->tx_buffer_info)
                tx_ring->tx_buffer_info = vzalloc(size);
        if (!tx_ring->tx_buffer_info)
@@ -5206,7 +5206,7 @@ int ixgbe_setup_tx_resources(struct ixgbe_ring *tx_ring)
        tx_ring->size = tx_ring->count * sizeof(union ixgbe_adv_tx_desc);
        tx_ring->size = ALIGN(tx_ring->size, 4096);
 
-       set_dev_node(dev, numa_node);
+       set_dev_node(dev, ring_node);
        tx_ring->desc = dma_alloc_coherent(dev,
                                           tx_ring->size,
                                           &tx_ring->dma,
@@ -5270,15 +5270,15 @@ int ixgbe_setup_rx_resources(struct ixgbe_ring *rx_ring)
 {
        struct device *dev = rx_ring->dev;
        int orig_node = dev_to_node(dev);
-       int numa_node = -1;
+       int ring_node = -1;
        int size;
 
        size = sizeof(struct ixgbe_rx_buffer) * rx_ring->count;
 
        if (rx_ring->q_vector)
-               numa_node = rx_ring->q_vector->numa_node;
+               ring_node = rx_ring->q_vector->numa_node;
 
-       rx_ring->rx_buffer_info = vzalloc_node(size, numa_node);
+       rx_ring->rx_buffer_info = vzalloc_node(size, ring_node);
        if (!rx_ring->rx_buffer_info)
                rx_ring->rx_buffer_info = vzalloc(size);
        if (!rx_ring->rx_buffer_info)
@@ -5290,7 +5290,7 @@ int ixgbe_setup_rx_resources(struct ixgbe_ring *rx_ring)
        rx_ring->size = rx_ring->count * sizeof(union ixgbe_adv_rx_desc);
        rx_ring->size = ALIGN(rx_ring->size, 4096);
 
-       set_dev_node(dev, numa_node);
+       set_dev_node(dev, ring_node);
        rx_ring->desc = dma_alloc_coherent(dev,
                                           rx_ring->size,
                                           &rx_ring->dma,