aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/ich8lan.c
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2011-01-06 09:29:48 -0500
committerDavid S. Miller <davem@davemloft.net>2011-01-10 02:44:06 -0500
commitdd93f95e92283498f2497a632a81c167444668b5 (patch)
treefa5067184bc32c77bec6931a5a9862d8d137c270 /drivers/net/e1000e/ich8lan.c
parent0363466866d901fbc658f4e63dd61e7cc93dd0af (diff)
e1000e: cleanup variables set but not used
The ICR register is clear on read and we don't care what the returned value is when resetting the hardware so the icr variable(s) can be removed. We should not ignore the return from e1000_lv_jumbo_workaround_ich8lan() and from e1000_get_phy_id_82571() (dump a debug message when it fails and when an unknown Phy id is returned). Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Emil Tantilov <emil.s.tantilov@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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index d86cc0832720..754590d79f6d 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -2977,7 +2977,7 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
2977{ 2977{
2978 struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan; 2978 struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
2979 u16 reg; 2979 u16 reg;
2980 u32 ctrl, icr, kab; 2980 u32 ctrl, kab;
2981 s32 ret_val; 2981 s32 ret_val;
2982 2982
2983 /* 2983 /*
@@ -3067,7 +3067,7 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
3067 ew32(CRC_OFFSET, 0x65656565); 3067 ew32(CRC_OFFSET, 0x65656565);
3068 3068
3069 ew32(IMC, 0xffffffff); 3069 ew32(IMC, 0xffffffff);
3070 icr = er32(ICR); 3070 er32(ICR);
3071 3071
3072 kab = er32(KABGTXD); 3072 kab = er32(KABGTXD);
3073 kab |= E1000_KABGTXD_BGSQLBIAS; 3073 kab |= E1000_KABGTXD_BGSQLBIAS;