]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
drivers/net/atl1c: Remove double test
authorJulia Lawall <julia@diku.dk>
Sat, 28 Aug 2010 05:41:02 +0000 (05:41 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 28 Aug 2010 23:06:44 +0000 (16:06 -0700)
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>
drivers/net/atl1c/atl1c_hw.c

index d8501f060957afac49afd7726158020aa96de4b2..919080b2c3a50eb48bea7311ac0db4e8d3e8103e 100644 (file)
@@ -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);
        }