diff options
author | Julia Lawall <julia@diku.dk> | 2010-08-03 23:34:36 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-31 11:13:15 -0700 |
commit | a3d7fc5ce9f5985ce5230e336f104608835693a1 (patch) | |
tree | 5c198395c5645e34aad7e5a7b95bcdf4a696d660 /drivers/staging/pohmelfs | |
parent | ace9115712f64315d59a86146103f6f6fc32cde3 (diff) |
staging: Drop unnecessary null test
list_for_each_entry binds its first argument to a non-null value, and thus
any null test on the value of that argument is superfluous.
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
iterator I;
expression x;
statement S;
@@
I(x,...) { <...
- if (x != NULL || ...)
S
...> }
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/pohmelfs')
-rw-r--r-- | drivers/staging/pohmelfs/config.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/drivers/staging/pohmelfs/config.c b/drivers/staging/pohmelfs/config.c index 8c8d1c282e7e..89279ba1b737 100644 --- a/drivers/staging/pohmelfs/config.c +++ b/drivers/staging/pohmelfs/config.c @@ -301,10 +301,8 @@ static int pohmelfs_cn_dump(struct cn_msg *msg) mutex_lock(&pohmelfs_config_lock); - list_for_each_entry(g, &pohmelfs_config_list, group_entry) { - if (g) - total_msg += g->num_entry; - } + list_for_each_entry(g, &pohmelfs_config_list, group_entry) + total_msg += g->num_entry; if (total_msg == 0) { if (pohmelfs_send_reply(err, 0, POHMELFS_NOINFO_ACK, msg, NULL)) err = -ENOMEM; @@ -312,15 +310,16 @@ static int pohmelfs_cn_dump(struct cn_msg *msg) } list_for_each_entry(g, &pohmelfs_config_list, group_entry) { - if (g) { - list_for_each_entry_safe(c, tmp, &g->config_list, config_entry) { - struct pohmelfs_ctl *sc = &c->state.ctl; - if (pohmelfs_send_reply(err, total_msg - i, POHMELFS_CTLINFO_ACK, msg, sc)) { - err = -ENOMEM; - goto out_unlock; - } - i += 1; + list_for_each_entry_safe(c, tmp, &g->config_list, + config_entry) { + struct pohmelfs_ctl *sc = &c->state.ctl; + if (pohmelfs_send_reply(err, total_msg - i, + POHMELFS_CTLINFO_ACK, msg, + sc)) { + err = -ENOMEM; + goto out_unlock; } + i += 1; } } @@ -354,12 +353,11 @@ static int pohmelfs_cn_flush(struct cn_msg *msg) } } else { list_for_each_entry(g, &pohmelfs_config_list, group_entry) { - if (g) { - list_for_each_entry_safe(c, tmp, &g->config_list, config_entry) { - list_del(&c->config_entry); - g->num_entry--; - kfree(c); - } + list_for_each_entry_safe(c, tmp, &g->config_list, + config_entry) { + list_del(&c->config_entry); + g->num_entry--; + kfree(c); } } } |