kconfig: Delete unnecessary checks before the function call "sym_calc_value"

elfring · Michal Marek · commit 35ffd08d9bc9 · 2015-08-19T16:41:02.000+02:00
The sym_calc_value() function tests whether its argument is NULL and then
returns immediately. Thus the test around the call is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring &lt;elfring@users.sourceforge.net&gt;
Signed-off-by: Michal Marek &lt;mmarek@suse.com&gt;
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
@@ -268,8 +268,7 @@ int conf_read_simple(const char *name, int def)
 			goto load;
 		sym_add_change_count(1);
 		if (!sym_defconfig_list) {
-			if (modules_sym)
-				sym_calc_value(modules_sym);
+			sym_calc_value(modules_sym);
 			return 1;
 		}
 
@@ -404,9 +403,7 @@ int conf_read_simple(const char *name, int def)
 	}
 	free(line);
 	fclose(in);
-
-	if (modules_sym)
-		sym_calc_value(modules_sym);
+	sym_calc_value(modules_sym);
 	return 0;
 }
 
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
@@ -467,8 +467,7 @@ void sym_clear_all_valid(void)
 	for_all_symbols(i, sym)
 		sym->flags &= ~SYMBOL_VALID;
 	sym_add_change_count(1);
-	if (modules_sym)
-		sym_calc_value(modules_sym);
+	sym_calc_value(modules_sym);
 }
 
 bool sym_tristate_within_range(struct symbol *sym, tristate val)

Original file line number	Diff line number	Diff line change
`@@ -268,8 +268,7 @@ int conf_read_simple(const char *name, int def)`
`268`	`268`	`goto load;`
`269`	`269`	`sym_add_change_count(1);`
`270`	`270`	`if (!sym_defconfig_list) {`
`271`		`- if (modules_sym)`
`272`		`- sym_calc_value(modules_sym);`
	`271`	`+ sym_calc_value(modules_sym);`
`273`	`272`	`return 1;`
`274`	`273`	`}`
`275`	`274`
`@@ -404,9 +403,7 @@ int conf_read_simple(const char *name, int def)`
`404`	`403`	`}`
`405`	`404`	`free(line);`
`406`	`405`	`fclose(in);`
`407`		`-`
`408`		`- if (modules_sym)`
`409`		`- sym_calc_value(modules_sym);`
	`406`	`+ sym_calc_value(modules_sym);`
`410`	`407`	`return 0;`
`411`	`408`	`}`
`412`	`409`
Original file line number	Diff line number	Diff line change
`@@ -467,8 +467,7 @@ void sym_clear_all_valid(void)`
`467`	`467`	`for_all_symbols(i, sym)`
`468`	`468`	`sym->flags &= ~SYMBOL_VALID;`
`469`	`469`	`sym_add_change_count(1);`
`470`		`- if (modules_sym)`
`471`		`- sym_calc_value(modules_sym);`
	`470`	`+ sym_calc_value(modules_sym);`
`472`	`471`	`}`
`473`	`472`
`474`	`473`	`bool sym_tristate_within_range(struct symbol *sym, tristate val)`