diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2016-04-11 21:33:09 +0200 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2016-07-27 05:08:00 +0200 |
| commit | c75b590d60ffa3e31bcb9608b68006a8bab9e0ed (patch) | |
| tree | 7e67e27d736823cf0dfda9cd777ea1db569bf974 /kernel | |
| parent | module: fix noreturn attribute for __module_put_and_exit() (diff) | |
| download | linux-c75b590d60ffa3e31bcb9608b68006a8bab9e0ed.tar.xz linux-c75b590d60ffa3e31bcb9608b68006a8bab9e0ed.zip | |
module: fix redundant test.
[linux-4.5-rc4/kernel/module.c:1692]: (style) Redundant condition: attr.test.
'!attr.test || (attr.test && attr.test(mod))' is equivalent to '!attr.test ||
attr.test(mod)'
This code was added like this ten years ago, in c988d2b284549
"modules: add version and srcversion to sysfs".
Reported-by: David Binderman <dcb314@hotmail.com>
Cc: Matt Domsch <Matt_Domsch@dell.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/module.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/module.c b/kernel/module.c index 5e876977844b..9e04a4210a4a 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -1693,8 +1693,7 @@ static int module_add_modinfo_attrs(struct module *mod) temp_attr = mod->modinfo_attrs; for (i = 0; (attr = modinfo_attrs[i]) && !error; i++) { - if (!attr->test || - (attr->test && attr->test(mod))) { + if (!attr->test || attr->test(mod)) { memcpy(temp_attr, attr, sizeof(*temp_attr)); sysfs_attr_init(&temp_attr->attr); error = sysfs_create_file(&mod->mkobj.kobj, |