diff options
author | Julia Lawall <julia@diku.dk> | 2008-12-21 10:39:15 -0500 |
---|---|---|
committer | Krzysztof Hałasa <khc@pm.waw.pl> | 2008-12-21 19:12:09 -0500 |
commit | 4cb56b685617732733d4d9dffbf8c5a81d4a0c71 (patch) | |
tree | 8e2a0be26a2713b10f0adac145823df59d0102aa /drivers/net/wan | |
parent | 93bc933524d05e3b391358e24b3666599f8ec026 (diff) |
drivers/net/wan: Remove redundant test
arg is checked not to be NULL a few lines before.
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: Krzysztof Hałasa <khc@pm.waw.pl>
Diffstat (limited to 'drivers/net/wan')
-rw-r--r-- | drivers/net/wan/pc300_drv.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c index d67957af589c..c23fde0c0344 100644 --- a/drivers/net/wan/pc300_drv.c +++ b/drivers/net/wan/pc300_drv.c | |||
@@ -2718,9 +2718,8 @@ static int cpc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
2718 | } | 2718 | } |
2719 | pc300patrntst.num_errors = | 2719 | pc300patrntst.num_errors = |
2720 | falc_pattern_test_error(card, ch); | 2720 | falc_pattern_test_error(card, ch); |
2721 | if (!arg | 2721 | if (copy_to_user(arg, &pc300patrntst, |
2722 | || copy_to_user(arg, &pc300patrntst, | 2722 | sizeof(pc300patterntst_t))) |
2723 | sizeof (pc300patterntst_t))) | ||
2724 | return -EINVAL; | 2723 | return -EINVAL; |
2725 | } else { | 2724 | } else { |
2726 | falc_pattern_test(card, ch, pc300patrntst.patrntst_on); | 2725 | falc_pattern_test(card, ch, pc300patrntst.patrntst_on); |