e1000e: cosmetic - group local variables of the same type

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
index 474f4e419d2084eaa5da205b698290a2ce845c5b..62bbc6e0a76a654c53a7b168851d4163867ac651 100644 (file)
--- a/drivers/net/e1000e/82571.c
+++ b/drivers/net/e1000e/82571.c
@@ -693,8 +693,7 @@ static s32 e1000_write_nvm_eewr_82571(struct e1000_hw *hw, u16 offset,
                                      u16 words, u16 *data)
 {
        struct e1000_nvm_info *nvm = &hw->nvm;
-       u32 i;
-       u32 eewr = 0;
+       u32 i, eewr = 0;
        s32 ret_val = 0;
 
        /*
@@ -829,10 +828,7 @@ static s32 e1000_set_d0_lplu_state_82571(struct e1000_hw *hw, bool active)
  **/
 static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
 {
-       u32 ctrl;
-       u32 extcnf_ctrl;
-       u32 ctrl_ext;
-       u32 icr;
+       u32 ctrl, extcnf_ctrl, ctrl_ext, icr;
        s32 ret_val;
        u16 i = 0;
 
@@ -941,8 +937,7 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)
        struct e1000_mac_info *mac = &hw->mac;
        u32 reg_data;
        s32 ret_val;
-       u16 i;
-       u16 rar_count = mac->rar_entry_count;
+       u16 i, rar_count = mac->rar_entry_count;
 
        e1000_initialize_hw_bits_82571(hw);
 

diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c
index 6ba1228836e740d2b0001dc07a79f081e0ccad03..e50579859e062055969b09fb8b60a6fa00e11cfa 100644 (file)
--- a/drivers/net/e1000e/es2lan.c
+++ b/drivers/net/e1000e/es2lan.c
@@ -695,8 +695,7 @@ static s32 e1000_get_cable_length_80003es2lan(struct e1000_hw *hw)
 {
        struct e1000_phy_info *phy = &hw->phy;
        s32 ret_val;
-       u16 phy_data;
-       u16 index;
+       u16 phy_data, index;
 
        ret_val = e1e_rphy(hw, GG82563_PHY_DSP_DISTANCE, &phy_data);
        if (ret_val)
@@ -746,8 +745,7 @@ static s32 e1000_get_link_up_info_80003es2lan(struct e1000_hw *hw, u16 *speed,
  **/
 static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw)
 {
-       u32 ctrl;
-       u32 icr;
+       u32 ctrl, icr;
        s32 ret_val;
 
        /*

diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index f991b14a98d3283909f6dd565aa95fc5be46609b..568bb259c6fd1daf71d6f6c805fc80c8610fcd8b 100644 (file)
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -706,7 +706,9 @@ static void e1000_release_swflag_ich8lan(struct e1000_hw *hw)
  **/
 static bool e1000_check_mng_mode_ich8lan(struct e1000_hw *hw)
 {
-       u32 fwsm = er32(FWSM);
+       u32 fwsm;
+
+       fwsm = er32(FWSM);
 
        return (fwsm & E1000_FWSM_MODE_MASK) ==
                (E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT);
@@ -2349,9 +2351,7 @@ static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank)
        u32 flash_bank_size = nvm->flash_bank_size * 2;
        s32 ret_val;
        s32 count = 0;
-       s32 iteration;
-       s32 sector_size;
-       s32 j;
+       s32 j, iteration, sector_size;
 
        hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);