Commit c0e150acde52e4661675539bf5323309270f2e83
Committed by
Sam Ravnborg
Sam Ravnborg
1 parent
c955ccafc3
Exists in
master
and in
7 other branches
kconfig: remove SYMBOL_{YES,MOD,NO}
The SYMBOL_{YES,MOD,NO} are not really used anymore (they were more used be
the cml1 converter), so just remove them.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Showing 4 changed files with 6 additions and 14 deletions Side-by-side Diff
scripts/kconfig/expr.c
| ... | ... | @@ -145,7 +145,8 @@ |
| 145 | 145 | return; |
| 146 | 146 | } |
| 147 | 147 | if (e1->type == E_SYMBOL && e2->type == E_SYMBOL && |
| 148 | - e1->left.sym == e2->left.sym && (e1->left.sym->flags & (SYMBOL_YES|SYMBOL_NO))) | |
| 148 | + e1->left.sym == e2->left.sym && | |
| 149 | + (e1->left.sym == &symbol_yes || e1->left.sym == &symbol_no)) | |
| 149 | 150 | return; |
| 150 | 151 | if (!expr_eq(e1, e2)) |
| 151 | 152 | return; |
scripts/kconfig/expr.h
| ... | ... | @@ -78,10 +78,7 @@ |
| 78 | 78 | |
| 79 | 79 | #define for_all_symbols(i, sym) for (i = 0; i < 257; i++) for (sym = symbol_hash[i]; sym; sym = sym->next) if (sym->type != S_OTHER) |
| 80 | 80 | |
| 81 | -#define SYMBOL_YES 0x0001 | |
| 82 | -#define SYMBOL_MOD 0x0002 | |
| 83 | -#define SYMBOL_NO 0x0004 | |
| 84 | -#define SYMBOL_CONST 0x0007 | |
| 81 | +#define SYMBOL_CONST 0x0001 | |
| 85 | 82 | #define SYMBOL_CHECK 0x0008 |
| 86 | 83 | #define SYMBOL_CHOICE 0x0010 |
| 87 | 84 | #define SYMBOL_CHOICEVAL 0x0020 |
scripts/kconfig/gconf.c
| ... | ... | @@ -114,12 +114,6 @@ |
| 114 | 114 | |
| 115 | 115 | bzero(buf, 256); |
| 116 | 116 | |
| 117 | - if (val & SYMBOL_YES) | |
| 118 | - strcat(buf, "yes/"); | |
| 119 | - if (val & SYMBOL_MOD) | |
| 120 | - strcat(buf, "mod/"); | |
| 121 | - if (val & SYMBOL_NO) | |
| 122 | - strcat(buf, "no/"); | |
| 123 | 117 | if (val & SYMBOL_CONST) |
| 124 | 118 | strcat(buf, "const/"); |
| 125 | 119 | if (val & SYMBOL_CHECK) |
scripts/kconfig/symbol.c
| ... | ... | @@ -15,15 +15,15 @@ |
| 15 | 15 | struct symbol symbol_yes = { |
| 16 | 16 | .name = "y", |
| 17 | 17 | .curr = { "y", yes }, |
| 18 | - .flags = SYMBOL_YES|SYMBOL_VALID, | |
| 18 | + .flags = SYMBOL_CONST|SYMBOL_VALID, | |
| 19 | 19 | }, symbol_mod = { |
| 20 | 20 | .name = "m", |
| 21 | 21 | .curr = { "m", mod }, |
| 22 | - .flags = SYMBOL_MOD|SYMBOL_VALID, | |
| 22 | + .flags = SYMBOL_CONST|SYMBOL_VALID, | |
| 23 | 23 | }, symbol_no = { |
| 24 | 24 | .name = "n", |
| 25 | 25 | .curr = { "n", no }, |
| 26 | - .flags = SYMBOL_NO|SYMBOL_VALID, | |
| 26 | + .flags = SYMBOL_CONST|SYMBOL_VALID, | |
| 27 | 27 | }, symbol_empty = { |
| 28 | 28 | .name = "", |
| 29 | 29 | .curr = { "", no }, |