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/es2lan.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/es2lan.c')
-rw-r--r-- | drivers/net/e1000e/es2lan.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c index 6ba1228836e7..e50579859e06 100644 --- 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) | |||
695 | { | 695 | { |
696 | struct e1000_phy_info *phy = &hw->phy; | 696 | struct e1000_phy_info *phy = &hw->phy; |
697 | s32 ret_val; | 697 | s32 ret_val; |
698 | u16 phy_data; | 698 | u16 phy_data, index; |
699 | u16 index; | ||
700 | 699 | ||
701 | ret_val = e1e_rphy(hw, GG82563_PHY_DSP_DISTANCE, &phy_data); | 700 | ret_val = e1e_rphy(hw, GG82563_PHY_DSP_DISTANCE, &phy_data); |
702 | if (ret_val) | 701 | if (ret_val) |
@@ -746,8 +745,7 @@ static s32 e1000_get_link_up_info_80003es2lan(struct e1000_hw *hw, u16 *speed, | |||
746 | **/ | 745 | **/ |
747 | static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw) | 746 | static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw) |
748 | { | 747 | { |
749 | u32 ctrl; | 748 | u32 ctrl, icr; |
750 | u32 icr; | ||
751 | s32 ret_val; | 749 | s32 ret_val; |
752 | 750 | ||
753 | /* | 751 | /* |