Commit a708dd88 authored by Bruce Allan's avatar Bruce Allan Committed by David S. Miller
Browse files

e1000e: cosmetic - group local variables of the same type


Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9b724613
...@@ -693,8 +693,7 @@ static s32 e1000_write_nvm_eewr_82571(struct e1000_hw *hw, u16 offset, ...@@ -693,8 +693,7 @@ static s32 e1000_write_nvm_eewr_82571(struct e1000_hw *hw, u16 offset,
u16 words, u16 *data) u16 words, u16 *data)
{ {
struct e1000_nvm_info *nvm = &hw->nvm; struct e1000_nvm_info *nvm = &hw->nvm;
u32 i; u32 i, eewr = 0;
u32 eewr = 0;
s32 ret_val = 0; s32 ret_val = 0;
/* /*
...@@ -829,10 +828,7 @@ static s32 e1000_set_d0_lplu_state_82571(struct e1000_hw *hw, bool active) ...@@ -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) static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
{ {
u32 ctrl; u32 ctrl, extcnf_ctrl, ctrl_ext, icr;
u32 extcnf_ctrl;
u32 ctrl_ext;
u32 icr;
s32 ret_val; s32 ret_val;
u16 i = 0; u16 i = 0;
...@@ -941,8 +937,7 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw) ...@@ -941,8 +937,7 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)
struct e1000_mac_info *mac = &hw->mac; struct e1000_mac_info *mac = &hw->mac;
u32 reg_data; u32 reg_data;
s32 ret_val; s32 ret_val;
u16 i; u16 i, rar_count = mac->rar_entry_count;
u16 rar_count = mac->rar_entry_count;
e1000_initialize_hw_bits_82571(hw); e1000_initialize_hw_bits_82571(hw);
......
...@@ -695,8 +695,7 @@ static s32 e1000_get_cable_length_80003es2lan(struct e1000_hw *hw) ...@@ -695,8 +695,7 @@ static s32 e1000_get_cable_length_80003es2lan(struct e1000_hw *hw)
{ {
struct e1000_phy_info *phy = &hw->phy; struct e1000_phy_info *phy = &hw->phy;
s32 ret_val; s32 ret_val;
u16 phy_data; u16 phy_data, index;
u16 index;
ret_val = e1e_rphy(hw, GG82563_PHY_DSP_DISTANCE, &phy_data); ret_val = e1e_rphy(hw, GG82563_PHY_DSP_DISTANCE, &phy_data);
if (ret_val) if (ret_val)
...@@ -746,8 +745,7 @@ static s32 e1000_get_link_up_info_80003es2lan(struct e1000_hw *hw, u16 *speed, ...@@ -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) static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw)
{ {
u32 ctrl; u32 ctrl, icr;
u32 icr;
s32 ret_val; s32 ret_val;
/* /*
......
...@@ -706,7 +706,9 @@ static void e1000_release_swflag_ich8lan(struct e1000_hw *hw) ...@@ -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) 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) == return (fwsm & E1000_FWSM_MODE_MASK) ==
(E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT); (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) ...@@ -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; u32 flash_bank_size = nvm->flash_bank_size * 2;
s32 ret_val; s32 ret_val;
s32 count = 0; s32 count = 0;
s32 iteration; s32 j, iteration, sector_size;
s32 sector_size;
s32 j;
hsfsts.regval = er16flash(ICH_FLASH_HSFSTS); hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment