Skip to content

Commit 7c9bb07

Browse files
committed
kconfig: remove E_LIST expression type
E_LIST was preveously used to form an expression tree consisting of choice members. It is no longer used. Signed-off-by: Masahiro Yamada <[email protected]>
1 parent ca4c74b commit 7c9bb07

File tree

3 files changed

+2
-18
lines changed

3 files changed

+2
-18
lines changed

scripts/kconfig/expr.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ struct expr *expr_copy(const struct expr *org)
9090
break;
9191
case E_AND:
9292
case E_OR:
93-
case E_LIST:
9493
e->left.expr = expr_copy(org->left.expr);
9594
e->right.expr = expr_copy(org->right.expr);
9695
break;
@@ -286,7 +285,6 @@ int expr_eq(struct expr *e1, struct expr *e2)
286285
expr_free(e2);
287286
trans_count = old_count;
288287
return res;
289-
case E_LIST:
290288
case E_RANGE:
291289
case E_NONE:
292290
/* panic */;
@@ -676,7 +674,6 @@ struct expr *expr_transform(struct expr *e)
676674
case E_LTH:
677675
case E_UNEQUAL:
678676
case E_SYMBOL:
679-
case E_LIST:
680677
break;
681678
default:
682679
e->left.expr = expr_transform(e->left.expr);
@@ -947,7 +944,6 @@ struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symb
947944
break;
948945
case E_SYMBOL:
949946
return expr_alloc_comp(type, e->left.sym, sym);
950-
case E_LIST:
951947
case E_RANGE:
952948
case E_NONE:
953949
/* panic */;
@@ -1097,10 +1093,6 @@ static int expr_compare_type(enum expr_type t1, enum expr_type t2)
10971093
if (t2 == E_OR)
10981094
return 1;
10991095
/* fallthrough */
1100-
case E_OR:
1101-
if (t2 == E_LIST)
1102-
return 1;
1103-
/* fallthrough */
11041096
default:
11051097
break;
11061098
}
@@ -1173,13 +1165,6 @@ void expr_print(struct expr *e,
11731165
fn(data, NULL, " && ");
11741166
expr_print(e->right.expr, fn, data, E_AND);
11751167
break;
1176-
case E_LIST:
1177-
fn(data, e->right.sym, e->right.sym->name);
1178-
if (e->left.expr) {
1179-
fn(data, NULL, " ^ ");
1180-
expr_print(e->left.expr, fn, data, E_LIST);
1181-
}
1182-
break;
11831168
case E_RANGE:
11841169
fn(data, NULL, "[");
11851170
fn(data, e->left.sym, e->left.sym->name);

scripts/kconfig/expr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ typedef enum tristate {
2626
enum expr_type {
2727
E_NONE, E_OR, E_AND, E_NOT,
2828
E_EQUAL, E_UNEQUAL, E_LTH, E_LEQ, E_GTH, E_GEQ,
29-
E_LIST, E_SYMBOL, E_RANGE
29+
E_SYMBOL, E_RANGE
3030
};
3131

3232
union expr_data {

scripts/kconfig/symbol.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1316,8 +1316,7 @@ struct symbol *sym_check_deps(struct symbol *sym)
13161316

13171317
struct symbol *prop_get_symbol(struct property *prop)
13181318
{
1319-
if (prop->expr && (prop->expr->type == E_SYMBOL ||
1320-
prop->expr->type == E_LIST))
1319+
if (prop->expr && prop->expr->type == E_SYMBOL)
13211320
return prop->expr->left.sym;
13221321
return NULL;
13231322
}

0 commit comments

Comments
 (0)