From: Masahiro Yamada <masahiroy@kernel.org>
Date: Sun, 21 Feb 2021 09:26:23 +0000 (+0900)
Subject: kconfig: remove dead code in conf_askvalue()
X-Git-Tag: v5.12-rc1~35^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=102a1a72d0c80ffceae1e2a5d371699463c93733;p=thirdparty%2Fkernel%2Flinux.git

kconfig: remove dead code in conf_askvalue()

conf_askvalue() is only called for oldconfig, syncconfig, and
oldaskconfig. If it is called for other cases, it is a bug.

So, the code after the switch statement is unreachable.

Remove the dead code, and clean up the switch statement.

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

diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 369615d6c97ee..3a98c9e0a7c8e 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -84,8 +84,6 @@ static void xfgets(char *str, int size, FILE *in)
 
 static int conf_askvalue(struct symbol *sym, const char *def)
 {
-	enum symbol_type type = sym_get_type(sym);
-
 	if (!sym_has_value(sym))
 		printf("(NEW) ");
 
@@ -107,24 +105,12 @@ static int conf_askvalue(struct symbol *sym, const char *def)
 			return 0;
 		}
 		/* fall through */
-	case oldaskconfig:
+	default:
 		fflush(stdout);
 		xfgets(line, sizeof(line), stdin);
-		return 1;
-	default:
 		break;
 	}
 
-	switch (type) {
-	case S_INT:
-	case S_HEX:
-	case S_STRING:
-		printf("%s\n", def);
-		return 1;
-	default:
-		;
-	}
-	printf("%s", line);
 	return 1;
 }