igb: Realign bad indentation

Statements should start on tabstops.

Use a single statement and test instead of multiple tests.

Signed-off-by: Joe Perches <joe@perches.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/e1000_mac.c b/drivers/net/ethernet/intel/igb/e1000_mac.c
index 5010e2232c504dda296b7d19cc5c5f9931f08202..5eff82678f0ba41f7e171f2101b856a594b2264b 100644 (file)
--- a/drivers/net/ethernet/intel/igb/e1000_mac.c
+++ b/drivers/net/ethernet/intel/igb/e1000_mac.c
@@ -792,15 +792,13 @@ static s32 igb_set_default_fc(struct e1000_hw *hw)
         * control setting, then the variable hw->fc will
         * be initialized based on a value in the EEPROM.
         */
-       if (hw->mac.type == e1000_i350) {
+       if (hw->mac.type == e1000_i350)
                lan_offset = NVM_82580_LAN_FUNC_OFFSET(hw->bus.func);
-               ret_val = hw->nvm.ops.read(hw, NVM_INIT_CONTROL2_REG
-                                          + lan_offset, 1, &nvm_data);
-        } else {
-               ret_val = hw->nvm.ops.read(hw, NVM_INIT_CONTROL2_REG,
-                                          1, &nvm_data);
-        }
+       else
+               lan_offset = 0;
 
+       ret_val = hw->nvm.ops.read(hw, NVM_INIT_CONTROL2_REG + lan_offset,
+                                  1, &nvm_data);
        if (ret_val) {
                hw_dbg("NVM Read Error\n");
                goto out;
@@ -808,8 +806,7 @@ static s32 igb_set_default_fc(struct e1000_hw *hw)
 
        if ((nvm_data & NVM_WORD0F_PAUSE_MASK) == 0)
                hw->fc.requested_mode = e1000_fc_none;
-       else if ((nvm_data & NVM_WORD0F_PAUSE_MASK) ==
-                NVM_WORD0F_ASM_DIR)
+       else if ((nvm_data & NVM_WORD0F_PAUSE_MASK) == NVM_WORD0F_ASM_DIR)
                hw->fc.requested_mode = e1000_fc_tx_pause;
        else
                hw->fc.requested_mode = e1000_fc_full;