diff options
author | Julia Lawall <julia@diku.dk> | 2008-12-25 18:03:09 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-25 18:03:09 -0800 |
commit | 662f44af635f6bde366d44abacaeec7916d9f168 (patch) | |
tree | 7c2fd9da285baba853f7cc43f2a3f8963818e487 /drivers | |
parent | b0fd0d235df2b3cf8e5e244e301614092a9c317c (diff) |
drivers/net/ehea: Remove redundant test
In each case, vpage is checked not to be NULL just after it is initialized
at the beginning of each loop iteration.
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/ehea/ehea_qmr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ehea/ehea_qmr.c b/drivers/net/ehea/ehea_qmr.c index 3c0ec82f36f..e8c952b6166 100644 --- a/drivers/net/ehea/ehea_qmr.c +++ b/drivers/net/ehea/ehea_qmr.c @@ -182,7 +182,7 @@ struct ehea_cq *ehea_create_cq(struct ehea_adapter *adapter, goto out_kill_hwq; } } else { - if ((hret != H_PAGE_REGISTERED) || (!vpage)) { + if (hret != H_PAGE_REGISTERED) { ehea_error("CQ: registration of page failed " "hret=%lx\n", hret); goto out_kill_hwq; @@ -303,7 +303,7 @@ struct ehea_eq *ehea_create_eq(struct ehea_adapter *adapter, goto out_kill_hwq; } else { - if ((hret != H_PAGE_REGISTERED) || (!vpage)) + if (hret != H_PAGE_REGISTERED) goto out_kill_hwq; } |