summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-08-28 05:41:02 +0000
committerDavid S. Miller <davem@davemloft.net>2010-08-28 16:06:44 -0700
commit2bc9e234658072145b63d1d364bac4c8e337c865 (patch)
treed13ed7df78507087e0541685469f0e772c09ea56
parent56543af9563d91c1c5596a7980b416389bdea071 (diff)
downloadop-kernel-dev-2bc9e234658072145b63d1d364bac4c8e337c865.zip
op-kernel-dev-2bc9e234658072145b63d1d364bac4c8e337c865.tar.gz
drivers/net/atl1c: Remove double test
The nic_type field is compared to athr_l2c twice. The sematic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @expression@ expression E; @@ ( * E || ... || E | * E && ... && E ) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/atl1c/atl1c_hw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/atl1c/atl1c_hw.c b/drivers/net/atl1c/atl1c_hw.c
index d8501f0..919080b 100644
--- a/drivers/net/atl1c/atl1c_hw.c
+++ b/drivers/net/atl1c/atl1c_hw.c
@@ -480,7 +480,7 @@ int atl1c_phy_reset(struct atl1c_hw *hw)
atl1c_write_phy_reg(hw, MII_DBG_DATA, 0x929D);
}
if (hw->nic_type == athr_l1c || hw->nic_type == athr_l2c_b2
- || hw->nic_type == athr_l2c || hw->nic_type == athr_l2c) {
+ || hw->nic_type == athr_l2c) {
atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0x29);
atl1c_write_phy_reg(hw, MII_DBG_DATA, 0xB6DD);
}
OpenPOWER on IntegriCloud