kconfig: remove redundant NULL pointer check before free()

Passing NULL to free() is allowed and is a no-op.

Remove redundant NULL pointer checks.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index bd14aae1db582f26bbd0851af3e8a58ab42acc29..f1197e67243161db800ef81e111b374a85a7056a 100644 (file)
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -432,8 +432,7 @@ int conf_read_simple(const char *name, int def)
                case S_INT:
                case S_HEX:
                case S_STRING:
-                       if (sym->def[def].val)
-                               free(sym->def[def].val);
+                       free(sym->def[def].val);
                        /* fall through */
                default:
                        sym->def[def].val = NULL;

diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index b78f114ad48cc5bac6e57246f8a2df4dabc0271d..92e5b2b9761d70966279ac0159769adf580110fa 100644 (file)
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -42,8 +42,7 @@ struct gstr str_new(void)
 /* Free storage for growable string */
 void str_free(struct gstr *gs)
 {
-       if (gs->s)
-               free(gs->s);
+       free(gs->s);
        gs->s = NULL;
        gs->len = 0;
 }