2014-11-02 19:42:41

by SF Markus Elfring

Subject: [PATCH 1/1] kconfig: Deletion of unnecessary checks before the function call "sym_calc_value"

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 <[email protected]>
---
scripts/kconfig/confdata.c | 6 ++----
scripts/kconfig/symbol.c | 3 +--
2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index f88d90f..3073cb6 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -262,8 +262,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;
}

@@ -399,8 +398,7 @@ setsym:
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
index 7caabdb..3f7797b 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -447,8 +447,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);
}

void sym_set_changed(struct symbol *sym)
--
2.1.3

2014-11-03 10:36:04

by Paul Bolle

Subject: Re: [PATCH 1/1] kconfig: Deletion of unnecessary checks before the function call "sym_calc_value"

Since you use "SF Markus Elfring", this patch should start with:

From: Markus Elfring <[email protected]>

We don't care that you used a sourceforge.net address. Or has SF another
meaning?

On Sun, 2014-11-02 at 20:42 +0100, SF Markus Elfring wrote:
> 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.

Side note: I guess the coccinelle script you use just skips cases like
if (sym) {
sym_calc_value(sym);
do_foo_bar():
}

Or did you filter those manually?

> Signed-off-by: Markus Elfring <[email protected]>
> ---
> scripts/kconfig/confdata.c | 6 ++----
> scripts/kconfig/symbol.c | 3 +--
> 2 files changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
> index f88d90f..3073cb6 100644
> --- a/scripts/kconfig/confdata.c
> +++ b/scripts/kconfig/confdata.c
> @@ -262,8 +262,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;
> }
>
> @@ -399,8 +398,7 @@ setsym:
> 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
> index 7caabdb..3f7797b 100644
> --- a/scripts/kconfig/symbol.c
> +++ b/scripts/kconfig/symbol.c
> @@ -447,8 +447,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);
> }
>
> void sym_set_changed(struct symbol *sym)

Please resend with
Acked-by: Paul Bolle <[email protected]>

added.


Paul Bolle

2014-11-03 18:41:02

by SF Markus Elfring

Subject: [PATCH v2] kconfig: Deletion of unnecessary checks before the function call "sym_calc_value"

From: Markus Elfring <[email protected]>

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 <[email protected]>
Acked-by: Paul Bolle <[email protected]>
---
scripts/kconfig/confdata.c | 6 ++----
scripts/kconfig/symbol.c | 3 +--
2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index f88d90f..3073cb6 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -262,8 +262,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;
}

@@ -399,8 +398,7 @@ setsym:
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
index 7caabdb..3f7797b 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -447,8 +447,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);
}

void sym_set_changed(struct symbol *sym)
--
2.1.3

2015-07-07 19:55:44

by SF Markus Elfring

Subject: [PATCH v3] kconfig: Delete unnecessary checks before the function call "sym_calc_value"

From: Markus Elfring <[email protected]>
Date: Tue, 7 Jul 2015 21:48:23 +0200

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 <[email protected]>
---
scripts/kconfig/confdata.c | 7 ++-----
scripts/kconfig/symbol.c | 3 +--
2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index c814f57..0b7dc2f 100644
--- 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 @@ setsym:
}
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
index 70c5ee1..50878dc 100644
--- 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)
--
2.4.5

2015-08-19 14:46:16

by Michal Marek

Subject: Re: [PATCH v3] kconfig: Delete unnecessary checks before the function call "sym_calc_value"

On 2015-07-07 21:54, SF Markus Elfring wrote:
> From: Markus Elfring <[email protected]>
> Date: Tue, 7 Jul 2015 21:48:23 +0200
>
> 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.

Applied to kbuild.git#kconfig.

Michal