diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2009-11-20 18:28:37 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-21 14:34:30 -0500 |
commit | a708dd88a014a8fd78713adbd19bc61046eaac7f (patch) | |
tree | 3118d050dd2f7f6a9040fee38e1d4397295cd304 /drivers/net/e1000e/ich8lan.c | |
parent | 9b724613c91ce60806ffc689f5032ff258644c6c (diff) |
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>
Diffstat (limited to 'drivers/net/e1000e/ich8lan.c')
-rw-r--r-- | drivers/net/e1000e/ich8lan.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c index f991b14a98d3..568bb259c6fd 100644 --- 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) | |||
706 | **/ | 706 | **/ |
707 | static bool e1000_check_mng_mode_ich8lan(struct e1000_hw *hw) | 707 | static bool e1000_check_mng_mode_ich8lan(struct e1000_hw *hw) |
708 | { | 708 | { |
709 | u32 fwsm = er32(FWSM); | 709 | u32 fwsm; |
710 | |||
711 | fwsm = er32(FWSM); | ||
710 | 712 | ||
711 | return (fwsm & E1000_FWSM_MODE_MASK) == | 713 | return (fwsm & E1000_FWSM_MODE_MASK) == |
712 | (E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT); | 714 | (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 | u32 flash_bank_size = nvm->flash_bank_size * 2; | 2351 | u32 flash_bank_size = nvm->flash_bank_size * 2; |
2350 | s32 ret_val; | 2352 | s32 ret_val; |
2351 | s32 count = 0; | 2353 | s32 count = 0; |
2352 | s32 iteration; | 2354 | s32 j, iteration, sector_size; |
2353 | s32 sector_size; | ||
2354 | s32 j; | ||
2355 | 2355 | ||
2356 | hsfsts.regval = er16flash(ICH_FLASH_HSFSTS); | 2356 | hsfsts.regval = er16flash(ICH_FLASH_HSFSTS); |
2357 | 2357 | ||