Skip to content

Commit d3bf4b4

Browse files
ulfalizergalak
authored andcommitted
scripts/dts: Remove dead 'aliases' check in insert_defs()
insert_defs() is the only function that adds keys to 'defs', and they always get added with an 'aliases' key. This function could get super simple if the duplicate-removal code could be removed. It only seems to be needed to prevent duplicates for some (unfortunately tricky) flash-related stuff now. Signed-off-by: Ulf Magnusson <[email protected]>
1 parent 25ff4b7 commit d3bf4b4

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

scripts/dts/extract/globals.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ def create_phandles(root, name):
111111

112112

113113
def insert_defs(node_path, new_defs, new_aliases):
114-
115114
for key in new_defs:
116115
if key.startswith('DT_COMPAT_'):
117116
node_path = 'compatibles'
@@ -122,11 +121,7 @@ def insert_defs(node_path, new_defs, new_aliases):
122121
if node_path in defs:
123122
remove = [k for k in new_aliases if k in defs[node_path]]
124123
for k in remove: del new_aliases[k]
125-
if 'aliases' in defs[node_path]:
126-
defs[node_path]['aliases'].update(new_aliases)
127-
else:
128-
defs[node_path]['aliases'] = new_aliases
129-
124+
defs[node_path]['aliases'].update(new_aliases)
130125
defs[node_path].update(new_defs)
131126
else:
132127
new_defs['aliases'] = new_aliases

0 commit comments

Comments
 (0)