Commit c75b590d authored Apr 12, 2016 by Rusty Russell

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 c988d2b2
"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>

parent bf262dce

kernel/module.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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,

Admin message