Skip to contentSkip to conversation

kconfig: nuke second argument of conf_write_symbol()

PATCH In review Arnaud Lacombe 2 participants 3 messages Dec 5, 2010 – Dec 15, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kconfig: nuke second argument of conf_write_symbol()

Replacing S_TRISTATE by S_BOOLEAN is a no-op for conf_write_symbol().

---
 scripts/kconfig/confdata.c |   17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)
scripts/kconfig/confdata.c +5 -12
index f349bdc..6fd43d7 100644
@@ -440,12 +440,11 @@ static void conf_write_string(bool headerfile, const char *name,
 	fputs("\"\n", out);
 }
 
-static void conf_write_symbol(struct symbol *sym, enum symbol_type type,
-                              FILE *out, bool write_no)
+static void conf_write_symbol(struct symbol *sym, FILE *out, bool write_no)
 {
 	const char *str;
 
-	switch (type) {
+	switch (sym->type) {
 	case S_BOOLEAN:
 	case S_TRISTATE:
 		switch (sym_get_tristate_value(sym)) {
@@ -532,7 +531,7 @@ int conf_write_defconfig(const char *filename)
 						goto next_menu;
 				}
 			}
-			conf_write_symbol(sym, sym->type, out, true);
+			conf_write_symbol(sym, out, true);
 		}
 next_menu:
 		if (menu->list != NULL) {
@@ -633,14 +632,8 @@ int conf_write(const char *name)
 			if (!(sym->flags & SYMBOL_WRITE))
 				goto next;
 			sym->flags &= ~SYMBOL_WRITE;
-			type = sym->type;
-			if (type == S_TRISTATE) {
-				sym_calc_value(modules_sym);
-				if (modules_sym->curr.tri == no)
-					type = S_BOOLEAN;
-			}
 			/* Write config symbol to file */
-			conf_write_symbol(sym, type, out, true);
+			conf_write_symbol(sym, out, true);
 		}
 
 next:
@@ -842,7 +835,7 @@ int conf_write_autoconf(void)
 			continue;
 
 		/* write symbol to config file */
-		conf_write_symbol(sym, sym->type, out, false);
+		conf_write_symbol(sym, out, false);
 
 		/* update autoconf and tristate files */
 		switch (sym->type) {
Signature · 1 line
1.7.2.30.gc37d7.dirty
#1 lore raw

Hi,

Quoted 7 lines · Arnaud Lacombe

Replacing S_TRISTATE by S_BOOLEAN is a no-op for conf_write_symbol().

---
 scripts/kconfig/confdata.c |   17 +++++------------

 1 files changed, 5 insertions(+), 12 deletions(-)

ping ?

- Arnaud

Quoted 57 lines
scripts/kconfig/confdata.c +2 -3
index f349bdc..6fd43d7 100644
@@ -440,12 +440,11 @@ static void conf_write_string(bool headerfile, const char *name,
        fputs("\"\n", out);
  }
 
-static void conf_write_symbol(struct symbol *sym, enum symbol_type type,
-                              FILE *out, bool write_no)
+static void conf_write_symbol(struct symbol *sym, FILE *out, bool write_no)
  {
        const char *str;
 
-       switch (type) {
+       switch (sym->type) {

       case S_BOOLEAN:
       case S_TRISTATE:
               switch (sym_get_tristate_value(sym)) {

scripts/kconfig/confdata.c +1 -1
@@ -532,7 +531,7 @@ int conf_write_defconfig(const char *filename)
                                                goto next_menu;
                                }
                        }
-                       conf_write_symbol(sym, sym->type, out, true);
+                       conf_write_symbol(sym, out, true);
                }

 next_menu:
               if (menu->list != NULL) {

scripts/kconfig/confdata.c +1 -7
@@ -633,14 +632,8 @@ int conf_write(const char *name)
                        if (!(sym->flags & SYMBOL_WRITE))
                                goto next;
                        sym->flags &= ~SYMBOL_WRITE;
-                       type = sym->type;
-                       if (type == S_TRISTATE) {
-                               sym_calc_value(modules_sym);
-                               if (modules_sym->curr.tri == no)
-                                       type = S_BOOLEAN;
-                       }
                        /* Write config symbol to file */
-                       conf_write_symbol(sym, type, out, true);
+                       conf_write_symbol(sym, out, true);
                }
 

 next:

scripts/kconfig/confdata.c +1 -2
@@ -842,7 +835,7 @@ int conf_write_autoconf(void)
                        continue;
 
                /* write symbol to config file */
-               conf_write_symbol(sym, sym->type, out, false);
+               conf_write_symbol(sym, out, false);
 
                /* update autoconf and tristate files */
                switch (sym->type) {
--

1.7.2.30.gc37d7.dirty

#2 lore raw
In reply to Arnaud Lacombe
Quoted 1 line · Arnaud Lacombe

Replacing S_TRISTATE by S_BOOLEAN is a no-op for conf_write_symbol().

Nice cleanup, applied to kbuild-2.6.git#kconfig, thanks.

Michal