diff options
author | 2009-11-20 23:28:37 +0000 | |
---|---|---|
committer | 2009-11-21 11:34:30 -0800 | |
commit | a708dd88a014a8fd78713adbd19bc61046eaac7f (patch) | |
tree | 3118d050dd2f7f6a9040fee38e1d4397295cd304 /drivers/net/e1000e/es2lan.c | |
parent | e1000e: remove redundant might_sleep() (diff) | |
download | linux-a708dd88a014a8fd78713adbd19bc61046eaac7f.tar.gz linux-a708dd88a014a8fd78713adbd19bc61046eaac7f.tar.bz2 linux-a708dd88a014a8fd78713adbd19bc61046eaac7f.zip |
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) { 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; /* |