OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Julia Lawall 2010-08-03 23:34:36 +02:00 committed by Greg Kroah-Hartman
parent ace9115712
commit a3d7fc5ce9
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/staging/pohmelfs/config.c
View File

@ -301,10 +301,8 @@ static int pohmelfs_cn_dump(struct cn_msg *msg)
mutex_lock(&pohmelfs_config_lock); mutex_lock(&pohmelfs_config_lock);
list_for_each_entry(g, &pohmelfs_config_list, group_entry) { list_for_each_entry(g, &pohmelfs_config_list, group_entry)
if (g) total_msg += g->num_entry;
total_msg += g->num_entry;
}
if (total_msg == 0) { if (total_msg == 0) {
if (pohmelfs_send_reply(err, 0, POHMELFS_NOINFO_ACK, msg, NULL)) if (pohmelfs_send_reply(err, 0, POHMELFS_NOINFO_ACK, msg, NULL))
err = -ENOMEM; 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) { list_for_each_entry(g, &pohmelfs_config_list, group_entry) {
if (g) { list_for_each_entry_safe(c, tmp, &g->config_list,
list_for_each_entry_safe(c, tmp, &g->config_list, config_entry) { config_entry) {
struct pohmelfs_ctl *sc = &c->state.ctl; struct pohmelfs_ctl *sc = &c->state.ctl;
if (pohmelfs_send_reply(err, total_msg - i, POHMELFS_CTLINFO_ACK, msg, sc)) { if (pohmelfs_send_reply(err, total_msg - i,
err = -ENOMEM; POHMELFS_CTLINFO_ACK, msg,
goto out_unlock; sc)) {
} err = -ENOMEM;
i += 1; goto out_unlock;
} }
i += 1;
} }
} }
@ -354,12 +353,11 @@ static int pohmelfs_cn_flush(struct cn_msg *msg)
} }
} else { } else {
list_for_each_entry(g, &pohmelfs_config_list, group_entry) { list_for_each_entry(g, &pohmelfs_config_list, group_entry) {
if (g) { list_for_each_entry_safe(c, tmp, &g->config_list,
list_for_each_entry_safe(c, tmp, &g->config_list, config_entry) { config_entry) {
list_del(&c->config_entry); list_del(&c->config_entry);
g->num_entry--; g->num_entry--;
kfree(c); kfree(c);
}
} }
} }
} }

6
drivers/staging/tm6000/tm6000-core.c
View File

@ -702,10 +702,8 @@ void tm6000_unregister_extension(struct tm6000_ops *ops)
struct tm6000_core *dev = NULL; struct tm6000_core *dev = NULL;
mutex_lock(&tm6000_devlist_mutex); mutex_lock(&tm6000_devlist_mutex);
list_for_each_entry(dev, &tm6000_devlist, devlist) { list_for_each_entry(dev, &tm6000_devlist, devlist)
if (dev) ops->fini(dev);
ops->fini(dev);
}
mutex_lock(&tm6000_extension_devlist_lock); mutex_lock(&tm6000_extension_devlist_lock);
printk(KERN_INFO "tm6000: Remove (%s) extension\n", ops->name); printk(KERN_INFO "tm6000: Remove (%s) extension\n", ops->name);