drivers/net/au1000_eth.c: Remove redundant test
phydev is checked to be not NULL a few lines above. A simplified version of the semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @r exists@ local idexpression x; expression E; position p1,p2; @@ if (x@p1 == NULL || ...) { ... when forall return ...; } ... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\) ( x@p2 == NULL | x@p2 != NULL ) // another path to the test that is not through p1? @s exists@ local idexpression r.x; position r.p1,r.p2; @@ ... when != x@p1 ( x@p2 == NULL | x@p2 != NULL ) @fix depends on !s@ position r.p1,r.p2; expression x,E; statement S1,S2; @@ ( - if ((x@p2 != NULL) || ...) S1 | - if ((x@p2 == NULL) && ...) S1 | - BUG_ON(x@p2 == NULL); ) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c062076cc9
commit
b0fd0d235d
|
@ -353,7 +353,6 @@ static int mii_probe (struct net_device *dev)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* now we are supposed to have a proper phydev, to attach to... */
|
/* now we are supposed to have a proper phydev, to attach to... */
|
||||||
BUG_ON(!phydev);
|
|
||||||
BUG_ON(phydev->attached_dev);
|
BUG_ON(phydev->attached_dev);
|
||||||
|
|
||||||
phydev = phy_connect(dev, phydev->dev.bus_id, &au1000_adjust_link, 0,
|
phydev = phy_connect(dev, phydev->dev.bus_id, &au1000_adjust_link, 0,
|
||||||
|
|
Loading…
Reference in a new issue