aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/82571.c
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2009-11-20 18:28:37 -0500
committerDavid S. Miller <davem@davemloft.net>2009-11-21 14:34:30 -0500
commita708dd88a014a8fd78713adbd19bc61046eaac7f (patch)
tree3118d050dd2f7f6a9040fee38e1d4397295cd304 /drivers/net/e1000e/82571.c
parent9b724613c91ce60806ffc689f5032ff258644c6c (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/82571.c')
-rw-r--r--drivers/net/e1000e/82571.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
index 474f4e419d20..62bbc6e0a76a 100644
--- 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,
693 u16 words, u16 *data) 693 u16 words, u16 *data)
694{ 694{
695 struct e1000_nvm_info *nvm = &hw->nvm; 695 struct e1000_nvm_info *nvm = &hw->nvm;
696 u32 i; 696 u32 i, eewr = 0;
697 u32 eewr = 0;
698 s32 ret_val = 0; 697 s32 ret_val = 0;
699 698
700 /* 699 /*
@@ -829,10 +828,7 @@ static s32 e1000_set_d0_lplu_state_82571(struct e1000_hw *hw, bool active)
829 **/ 828 **/
830static s32 e1000_reset_hw_82571(struct e1000_hw *hw) 829static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
831{ 830{
832 u32 ctrl; 831 u32 ctrl, extcnf_ctrl, ctrl_ext, icr;
833 u32 extcnf_ctrl;
834 u32 ctrl_ext;
835 u32 icr;
836 s32 ret_val; 832 s32 ret_val;
837 u16 i = 0; 833 u16 i = 0;
838 834
@@ -941,8 +937,7 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)
941 struct e1000_mac_info *mac = &hw->mac; 937 struct e1000_mac_info *mac = &hw->mac;
942 u32 reg_data; 938 u32 reg_data;
943 s32 ret_val; 939 s32 ret_val;
944 u16 i; 940 u16 i, rar_count = mac->rar_entry_count;
945 u16 rar_count = mac->rar_entry_count;
946 941
947 e1000_initialize_hw_bits_82571(hw); 942 e1000_initialize_hw_bits_82571(hw);
948 943