diff options
| author | Julia Lawall <julia@diku.dk> | 2008-12-25 18:03:28 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-25 18:03:28 -0800 |
| commit | 90f5dfcc6afafcc3e1c18298143c1213b071990d (patch) | |
| tree | a94b3c0947fb32d4ba92c224d92e888b9b91f77d /drivers | |
| parent | 662f44af635f6bde366d44abacaeec7916d9f168 (diff) | |
| download | linux-90f5dfcc6afafcc3e1c18298143c1213b071990d.tar.gz linux-90f5dfcc6afafcc3e1c18298143c1213b071990d.tar.bz2 linux-90f5dfcc6afafcc3e1c18298143c1213b071990d.zip | |
drivers/net: Remove redundant test
In each case, ap 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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ppp_async.c | 6 | ||||
| -rw-r--r-- | drivers/net/ppp_synctty.c | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c index 451bdb57d6fc..6567fabd2e13 100644 --- a/drivers/net/ppp_async.c +++ b/drivers/net/ppp_async.c @@ -293,9 +293,6 @@ ppp_asynctty_ioctl(struct tty_struct *tty, struct file *file, err = -EFAULT; switch (cmd) { case PPPIOCGCHAN: - err = -ENXIO; - if (!ap) - break; err = -EFAULT; if (put_user(ppp_channel_index(&ap->chan), p)) break; @@ -303,9 +300,6 @@ ppp_asynctty_ioctl(struct tty_struct *tty, struct file *file, break; case PPPIOCGUNIT: - err = -ENXIO; - if (!ap) - break; err = -EFAULT; if (put_user(ppp_unit_number(&ap->chan), p)) break; diff --git a/drivers/net/ppp_synctty.c b/drivers/net/ppp_synctty.c index 801d8f99d471..1e892b7b1f8c 100644 --- a/drivers/net/ppp_synctty.c +++ b/drivers/net/ppp_synctty.c @@ -333,9 +333,6 @@ ppp_synctty_ioctl(struct tty_struct *tty, struct file *file, err = -EFAULT; switch (cmd) { case PPPIOCGCHAN: - err = -ENXIO; - if (!ap) - break; err = -EFAULT; if (put_user(ppp_channel_index(&ap->chan), p)) break; @@ -343,9 +340,6 @@ ppp_synctty_ioctl(struct tty_struct *tty, struct file *file, break; case PPPIOCGUNIT: - err = -ENXIO; - if (!ap) - break; err = -EFAULT; if (put_user(ppp_unit_number(&ap->chan), p)) break; |