e1000e: cleanup whitespace and indentation

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

5 files changed, 38 insertions, 57 deletions

diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
index 086dad709179..b3fdc6977f2e 100644
--- a/drivers/net/ethernet/intel/e1000e/82571.c
+++ b/drivers/net/ethernet/intel/e1000e/82571.c
@@ -1269,18 +1269,16 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw)
                 reg |= E1000_PBA_ECC_CORR_EN;
                 ew32(PBA_ECC, reg);
         }
+
         /*
          * Workaround for hardware errata.
          * Ensure that DMA Dynamic Clock gating is disabled on 82571 and 82572
          */
-
-        if ((hw->mac.type == e1000_82571) ||
-           (hw->mac.type == e1000_82572)) {
-                reg = er32(CTRL_EXT);
-                reg &= ~E1000_CTRL_EXT_DMA_DYN_CLK_EN;
-                ew32(CTRL_EXT, reg);
-        }
-
+        if ((hw->mac.type == e1000_82571) || (hw->mac.type == e1000_82572)) {
+                reg = er32(CTRL_EXT);
+                reg &= ~E1000_CTRL_EXT_DMA_DYN_CLK_EN;
+                ew32(CTRL_EXT, reg);
+        }
 
         /* PCI-Ex Control Registers */
         switch (hw->mac.type) {
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 8e9af624d54a..64c76443a7aa 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -1230,9 +1230,8 @@ s32 e1000_configure_k1_ich8lan(struct e1000_hw *hw, bool k1_enable)
         u32 reg = 0;
         u16 kmrn_reg = 0;
 
-        ret_val = e1000e_read_kmrn_reg_locked(hw,
-                                             E1000_KMRNCTRLSTA_K1_CONFIG,
-                                             &kmrn_reg);
+        ret_val = e1000e_read_kmrn_reg_locked(hw, E1000_KMRNCTRLSTA_K1_CONFIG,
+                                              &kmrn_reg);
         if (ret_val)
                 return ret_val;
 
@@ -1241,9 +1240,8 @@ s32 e1000_configure_k1_ich8lan(struct e1000_hw *hw, bool k1_enable)
         else
                 kmrn_reg &= ~E1000_KMRNCTRLSTA_K1_ENABLE;
 
-        ret_val = e1000e_write_kmrn_reg_locked(hw,
-                                              E1000_KMRNCTRLSTA_K1_CONFIG,
-                                              kmrn_reg);
+        ret_val = e1000e_write_kmrn_reg_locked(hw, E1000_KMRNCTRLSTA_K1_CONFIG,
+                                               kmrn_reg);
         if (ret_val)
                 return ret_val;
 
diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c
index 59ac9f6353de..decad98c1059 100644
--- a/drivers/net/ethernet/intel/e1000e/mac.c
+++ b/drivers/net/ethernet/intel/e1000e/mac.c
@@ -629,7 +629,7 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw)
         if (E1000_TXCW_ANE & er32(TXCW)) {
                 status = er32(STATUS);
                 if (status & E1000_STATUS_LU) {
-                        /* SYNCH bit and IV bit are sticky, so reread rxcw.  */
+                        /* SYNCH bit and IV bit are sticky, so reread rxcw. */
                         udelay(10);
                         rxcw = er32(RXCW);
                         if (rxcw & E1000_RXCW_SYNCH) {
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index efb37290262d..a9a4ea2c616e 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -3262,6 +3262,7 @@ static void e1000e_set_rx_mode(struct net_device *netdev)
                 e1000e_vlan_filter_disable(adapter);
         } else {
                 int count;
+
                 if (netdev->flags & IFF_ALLMULTI) {
                         rctl |= E1000_RCTL_MPE;
                 } else {
@@ -6103,7 +6104,6 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         const struct e1000_info *ei = e1000_info_tbl[ent->driver_data];
         resource_size_t mmio_start, mmio_len;
         resource_size_t flash_start, flash_len;
-
         static int cards_found;
         u16 aspm_disable_flag = 0;
         int i, err, pci_using_dac;
@@ -6347,11 +6347,11 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         } else if (adapter->flags & FLAG_APME_IN_CTRL3) {
                 if (adapter->flags & FLAG_APME_CHECK_PORT_B &&
                     (adapter->hw.bus.func == 1))
-                        e1000_read_nvm(&adapter->hw,
-                                NVM_INIT_CONTROL3_PORT_B, 1, &eeprom_data);
+                        e1000_read_nvm(&adapter->hw, NVM_INIT_CONTROL3_PORT_B,
+                                       1, &eeprom_data);
                 else
-                        e1000_read_nvm(&adapter->hw,
-                                NVM_INIT_CONTROL3_PORT_A, 1, &eeprom_data);
+                        e1000_read_nvm(&adapter->hw, NVM_INIT_CONTROL3_PORT_A,
+                                       1, &eeprom_data);
         }
 
         /* fetch WoL from EEPROM */
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index 683abac4a049..6e768b11380e 100644
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
@@ -1007,12 +1007,12 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
          * The possible values of the "fc" parameter are:
          *      0:  Flow control is completely disabled
          *      1:  Rx flow control is enabled (we can receive pause frames
-         *        but not send pause frames).
+         *          but not send pause frames).
          *      2:  Tx flow control is enabled (we can send pause frames
-         *        but we do not support receiving pause frames).
+         *          but we do not support receiving pause frames).
          *      3:  Both Rx and Tx flow control (symmetric) are enabled.
          *  other:  No software override.  The flow control configuration
-         *        in the EEPROM is used.
+         *          in the EEPROM is used.
          */
         switch (hw->fc.current_mode) {
         case e1000_fc_none:
@@ -1172,10 +1172,8 @@ s32 e1000e_setup_copper_link(struct e1000_hw *hw)
          * Check link status. Wait up to 100 microseconds for link to become
          * valid.
          */
-        ret_val = e1000e_phy_has_link_generic(hw,
-                                             COPPER_LINK_UP_LIMIT,
-                                             10,
-                                             &link);
+        ret_val = e1000e_phy_has_link_generic(hw, COPPER_LINK_UP_LIMIT, 10,
+                                              &link);
         if (ret_val)
                 return ret_val;
 
@@ -1237,10 +1235,8 @@ s32 e1000e_phy_force_speed_duplex_igp(struct e1000_hw *hw)
         if (phy->autoneg_wait_to_complete) {
                 e_dbg("Waiting for forced speed/duplex link on IGP phy.\n");
 
-                ret_val = e1000e_phy_has_link_generic(hw,
-                                                     PHY_FORCE_LIMIT,
-                                                     100000,
-                                                     &link);
+                ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
+                                                      100000, &link);
                 if (ret_val)
                         return ret_val;
 
@@ -1248,10 +1244,8 @@ s32 e1000e_phy_force_speed_duplex_igp(struct e1000_hw *hw)
                         e_dbg("Link taking longer than expected.\n");
 
                 /* Try once more */
-                ret_val = e1000e_phy_has_link_generic(hw,
-                                                     PHY_FORCE_LIMIT,
-                                                     100000,
-                                                     &link);
+                ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
+                                                      100000, &link);
         }
 
         return ret_val;
@@ -1412,10 +1406,8 @@ s32 e1000_phy_force_speed_duplex_ife(struct e1000_hw *hw)
         if (phy->autoneg_wait_to_complete) {
                 e_dbg("Waiting for forced speed/duplex link on IFE phy.\n");
 
-                ret_val = e1000e_phy_has_link_generic(hw,
-                                                     PHY_FORCE_LIMIT,
-                                                     100000,
-                                                     &link);
+                ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
+                                                      100000, &link);
                 if (ret_val)
                         return ret_val;
 
@@ -1423,10 +1415,8 @@ s32 e1000_phy_force_speed_duplex_ife(struct e1000_hw *hw)
                         e_dbg("Link taking longer than expected.\n");
 
                 /* Try once more */
-                ret_val = e1000e_phy_has_link_generic(hw,
-                                                     PHY_FORCE_LIMIT,
-                                                     100000,
-                                                     &link);
+                ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
+                                                      100000, &link);
                 if (ret_val)
                         return ret_val;
         }
@@ -2167,6 +2157,7 @@ s32 e1000e_phy_hw_reset_generic(struct e1000_hw *hw)
 s32 e1000e_get_cfg_done(struct e1000_hw *hw)
 {
         mdelay(10);
+
         return 0;
 }
 
@@ -3155,13 +3146,11 @@ s32 e1000_link_stall_workaround_hv(struct e1000_hw *hw)
         if (ret_val)
                 return ret_val;
 
-        data &= BM_CS_STATUS_LINK_UP |
-                BM_CS_STATUS_RESOLVED |
-                BM_CS_STATUS_SPEED_MASK;
+        data &= BM_CS_STATUS_LINK_UP | BM_CS_STATUS_RESOLVED |
+                BM_CS_STATUS_SPEED_MASK;
 
-        if (data != (BM_CS_STATUS_LINK_UP |
-                     BM_CS_STATUS_RESOLVED |
-                     BM_CS_STATUS_SPEED_1000))
+        if (data != (BM_CS_STATUS_LINK_UP | BM_CS_STATUS_RESOLVED |
+                     BM_CS_STATUS_SPEED_1000))
                 return 0;
 
         mdelay(200);
@@ -3227,10 +3216,8 @@ s32 e1000_phy_force_speed_duplex_82577(struct e1000_hw *hw)
         if (phy->autoneg_wait_to_complete) {
                 e_dbg("Waiting for forced speed/duplex link on 82577 phy\n");
 
-                ret_val = e1000e_phy_has_link_generic(hw,
-                                                     PHY_FORCE_LIMIT,
-                                                     100000,
-                                                     &link);
+                ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
+                                                      100000, &link);
                 if (ret_val)
                         return ret_val;
 
@@ -3238,10 +3225,8 @@ s32 e1000_phy_force_speed_duplex_82577(struct e1000_hw *hw)
                         e_dbg("Link taking longer than expected.\n");
 
                 /* Try once more */
-                ret_val = e1000e_phy_has_link_generic(hw,
-                                                     PHY_FORCE_LIMIT,
-                                                     100000,
-                                                     &link);
+                ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
+                                                      100000, &link);
         }
 
         return ret_val;