diff options
author | Julia Lawall <julia@diku.dk> | 2008-12-26 03:02:49 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-26 03:02:49 +0100 |
commit | b0fd0d235df2b3cf8e5e244e301614092a9c317c (patch) | |
tree | dd0cf9a98e6a6e2b27e117ada3bd91e191508397 /drivers | |
parent | qlge: ql_adapter_down() typo (diff) | |
download | linux-b0fd0d235df2b3cf8e5e244e301614092a9c317c.tar.xz linux-b0fd0d235df2b3cf8e5e244e301614092a9c317c.zip |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/au1000_eth.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c index ecc2573b3dce..9c875bb3f76c 100644 --- a/drivers/net/au1000_eth.c +++ b/drivers/net/au1000_eth.c @@ -353,7 +353,6 @@ static int mii_probe (struct net_device *dev) } /* now we are supposed to have a proper phydev, to attach to... */ - BUG_ON(!phydev); BUG_ON(phydev->attached_dev); phydev = phy_connect(dev, phydev->dev.bus_id, &au1000_adjust_link, 0, |