Message ID | 1320654156-3240-1-git-send-email-tie-fei.zang@freescale.com |
---|---|
State | Accepted |
Commit | 56b13b1e06473d189bc202eb8a541d673fd20247 |
Headers | show |
Dear Roy Zang, In message <1320654156-3240-1-git-send-email-tie-fei.zang@freescale.com> you wrote: > Fix the following build warning in drivers/net/e1000.c > > e1000.c: In function 'e1000_reset_hw': > e1000.c:1373:11: warning: variable 'icr' set but not used [-Wunused-but-set-variable] > e1000.c: In function 'e1000_phy_init_script': > e1000.c:4395:11: warning: variable 'ret_val' set but not used [-Wunused-but-set-variable] > > Signed-off-by: Roy Zang <tie-fei.zang@freescale.com> > Cc: Wolfgang Denk <wd@denx.de> > Cc: Kyle Moffett <Kyle.D.Moffett@boeing.com> > --- > drivers/net/e1000.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) Applied, thanks. Best regards, Wolfgang Denk
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 6eab7b2..6b71bd9 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -1370,7 +1370,6 @@ e1000_reset_hw(struct e1000_hw *hw) { uint32_t ctrl; uint32_t ctrl_ext; - uint32_t icr; uint32_t manc; uint32_t pba = 0; @@ -1443,7 +1442,7 @@ e1000_reset_hw(struct e1000_hw *hw) E1000_WRITE_REG(hw, IMC, 0xffffffff); /* Clear any pending interrupt events. */ - icr = E1000_READ_REG(hw, ICR); + E1000_READ_REG(hw, ICR); /* If MWI was previously enabled, reenable it. */ if (hw->mac_type == e1000_82542_rev2_0) { @@ -4447,7 +4446,8 @@ e1000_phy_init_script(struct e1000_hw *hw) mdelay(20); /* Now enable the transmitter */ - e1000_write_phy_reg(hw, 0x2F5B, phy_saved_data); + if (!ret_val) + e1000_write_phy_reg(hw, 0x2F5B, phy_saved_data); if (hw->mac_type == e1000_82547) { uint16_t fused, fine, coarse;
Fix the following build warning in drivers/net/e1000.c e1000.c: In function 'e1000_reset_hw': e1000.c:1373:11: warning: variable 'icr' set but not used [-Wunused-but-set-variable] e1000.c: In function 'e1000_phy_init_script': e1000.c:4395:11: warning: variable 'ret_val' set but not used [-Wunused-but-set-variable] Signed-off-by: Roy Zang <tie-fei.zang@freescale.com> Cc: Wolfgang Denk <wd@denx.de> Cc: Kyle Moffett <Kyle.D.Moffett@boeing.com> --- drivers/net/e1000.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)