Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 04:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

kconfig: remove E_LIST expression type

Browse Source 
E_LIST was preveously used to form an expression tree consisting of
choice members.

It is no longer used.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Masahiro Yamada 2024-06-18 19:35:31 +09:00
parent ca4c74ba30
commit 7c9bb07a6e
3 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/kconfig/expr.c
View File

@ -90,7 +90,6 @@ struct expr *expr_copy(const struct expr *org)
break; break;
case E_AND: case E_AND:
case E_OR: case E_OR:
case E_LIST:
e->left.expr = expr_copy(org->left.expr); e->left.expr = expr_copy(org->left.expr);
e->right.expr = expr_copy(org->right.expr); e->right.expr = expr_copy(org->right.expr);
break; break;
@ -286,7 +285,6 @@ int expr_eq(struct expr *e1, struct expr *e2)
expr_free(e2); expr_free(e2);
trans_count = old_count; trans_count = old_count;
return res; return res;
case E_LIST:
case E_RANGE: case E_RANGE:
case E_NONE: case E_NONE:
/* panic */; /* panic */;
@ -676,7 +674,6 @@ struct expr *expr_transform(struct expr *e)
case E_LTH: case E_LTH:
case E_UNEQUAL: case E_UNEQUAL:
case E_SYMBOL: case E_SYMBOL:
case E_LIST:
break; break;
default: default:
e->left.expr = expr_transform(e->left.expr); 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
break; break;
case E_SYMBOL: case E_SYMBOL:
return expr_alloc_comp(type, e->left.sym, sym); return expr_alloc_comp(type, e->left.sym, sym);
case E_LIST:
case E_RANGE: case E_RANGE:
case E_NONE: case E_NONE:
/* panic */; /* panic */;
@ -1097,10 +1093,6 @@ static int expr_compare_type(enum expr_type t1, enum expr_type t2)
if (t2 == E_OR) if (t2 == E_OR)
return 1; return 1;
/* fallthrough */ /* fallthrough */
case E_OR:
if (t2 == E_LIST)
return 1;
/* fallthrough */
default: default:
break; break;
} }
@ -1173,13 +1165,6 @@ void expr_print(struct expr *e,
fn(data, NULL, " && "); fn(data, NULL, " && ");
expr_print(e->right.expr, fn, data, E_AND); expr_print(e->right.expr, fn, data, E_AND);
break; break;
case E_LIST:
fn(data, e->right.sym, e->right.sym->name);
if (e->left.expr) {
fn(data, NULL, " ^ ");
expr_print(e->left.expr, fn, data, E_LIST);
}
break;
case E_RANGE: case E_RANGE:
fn(data, NULL, "["); fn(data, NULL, "[");
fn(data, e->left.sym, e->left.sym->name); fn(data, e->left.sym, e->left.sym->name);

2
scripts/kconfig/expr.h
View File

@ -26,7 +26,7 @@ typedef enum tristate {
enum expr_type { enum expr_type {
E_NONE, E_OR, E_AND, E_NOT, E_NONE, E_OR, E_AND, E_NOT,
E_EQUAL, E_UNEQUAL, E_LTH, E_LEQ, E_GTH, E_GEQ, E_EQUAL, E_UNEQUAL, E_LTH, E_LEQ, E_GTH, E_GEQ,
E_LIST, E_SYMBOL, E_RANGE E_SYMBOL, E_RANGE
}; };
union expr_data { union expr_data {

3
scripts/kconfig/symbol.c
View File

@ -1316,8 +1316,7 @@ struct symbol *sym_check_deps(struct symbol *sym)
struct symbol *prop_get_symbol(struct property *prop) struct symbol *prop_get_symbol(struct property *prop)
{ {
if (prop->expr && (prop->expr->type == E_SYMBOL || if (prop->expr && prop->expr->type == E_SYMBOL)
prop->expr->type == E_LIST))
return prop->expr->left.sym; return prop->expr->left.sym;
return NULL; return NULL;
} }