igb: minor ethool regdump amendment

This patch has no functional impact and it is just a preparation
for the following patch. It removes an early return from the
'igb_get_regs()' function by moving the 82576-only registers
dump into an "if" block. With this preparation, we can dump more
non-82576 registers at the end of this function.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index c645d9e648e03b4ca17aafbc52e65f742ca21a37..401bc2bd6b210c76959a9780a7a0e99bf9671bfc 100644 (file)
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -675,41 +675,41 @@ static void igb_get_regs(struct net_device *netdev,
                regs_buff[554] = adapter->stats.b2ogprc;
        }
 
-       if (hw->mac.type != e1000_82576)
-               return;
-       for (i = 0; i < 12; i++)
-               regs_buff[555 + i] = rd32(E1000_SRRCTL(i + 4));
-       for (i = 0; i < 4; i++)
-               regs_buff[567 + i] = rd32(E1000_PSRTYPE(i + 4));
-       for (i = 0; i < 12; i++)
-               regs_buff[571 + i] = rd32(E1000_RDBAL(i + 4));
-       for (i = 0; i < 12; i++)
-               regs_buff[583 + i] = rd32(E1000_RDBAH(i + 4));
-       for (i = 0; i < 12; i++)
-               regs_buff[595 + i] = rd32(E1000_RDLEN(i + 4));
-       for (i = 0; i < 12; i++)
-               regs_buff[607 + i] = rd32(E1000_RDH(i + 4));
-       for (i = 0; i < 12; i++)
-               regs_buff[619 + i] = rd32(E1000_RDT(i + 4));
-       for (i = 0; i < 12; i++)
-               regs_buff[631 + i] = rd32(E1000_RXDCTL(i + 4));
-
-       for (i = 0; i < 12; i++)
-               regs_buff[643 + i] = rd32(E1000_TDBAL(i + 4));
-       for (i = 0; i < 12; i++)
-               regs_buff[655 + i] = rd32(E1000_TDBAH(i + 4));
-       for (i = 0; i < 12; i++)
-               regs_buff[667 + i] = rd32(E1000_TDLEN(i + 4));
-       for (i = 0; i < 12; i++)
-               regs_buff[679 + i] = rd32(E1000_TDH(i + 4));
-       for (i = 0; i < 12; i++)
-               regs_buff[691 + i] = rd32(E1000_TDT(i + 4));
-       for (i = 0; i < 12; i++)
-               regs_buff[703 + i] = rd32(E1000_TXDCTL(i + 4));
-       for (i = 0; i < 12; i++)
-               regs_buff[715 + i] = rd32(E1000_TDWBAL(i + 4));
-       for (i = 0; i < 12; i++)
-               regs_buff[727 + i] = rd32(E1000_TDWBAH(i + 4));
+       if (hw->mac.type == e1000_82576) {
+               for (i = 0; i < 12; i++)
+                       regs_buff[555 + i] = rd32(E1000_SRRCTL(i + 4));
+               for (i = 0; i < 4; i++)
+                       regs_buff[567 + i] = rd32(E1000_PSRTYPE(i + 4));
+               for (i = 0; i < 12; i++)
+                       regs_buff[571 + i] = rd32(E1000_RDBAL(i + 4));
+               for (i = 0; i < 12; i++)
+                       regs_buff[583 + i] = rd32(E1000_RDBAH(i + 4));
+               for (i = 0; i < 12; i++)
+                       regs_buff[595 + i] = rd32(E1000_RDLEN(i + 4));
+               for (i = 0; i < 12; i++)
+                       regs_buff[607 + i] = rd32(E1000_RDH(i + 4));
+               for (i = 0; i < 12; i++)
+                       regs_buff[619 + i] = rd32(E1000_RDT(i + 4));
+               for (i = 0; i < 12; i++)
+                       regs_buff[631 + i] = rd32(E1000_RXDCTL(i + 4));
+
+               for (i = 0; i < 12; i++)
+                       regs_buff[643 + i] = rd32(E1000_TDBAL(i + 4));
+               for (i = 0; i < 12; i++)
+                       regs_buff[655 + i] = rd32(E1000_TDBAH(i + 4));
+               for (i = 0; i < 12; i++)
+                       regs_buff[667 + i] = rd32(E1000_TDLEN(i + 4));
+               for (i = 0; i < 12; i++)
+                       regs_buff[679 + i] = rd32(E1000_TDH(i + 4));
+               for (i = 0; i < 12; i++)
+                       regs_buff[691 + i] = rd32(E1000_TDT(i + 4));
+               for (i = 0; i < 12; i++)
+                       regs_buff[703 + i] = rd32(E1000_TXDCTL(i + 4));
+               for (i = 0; i < 12; i++)
+                       regs_buff[715 + i] = rd32(E1000_TDWBAL(i + 4));
+               for (i = 0; i < 12; i++)
+                       regs_buff[727 + i] = rd32(E1000_TDWBAH(i + 4));
+       }
 }
 
 static int igb_get_eeprom_len(struct net_device *netdev)