Skip to content

Commit 41533a2

Browse files
fg-cfhaescolar
authored andcommitted
scripts: build: check_init_priorities: remove obsolete code
Removes a snippet of dead code. Signed-off-by: Florian Grandel <[email protected]>
1 parent cb99cd7 commit 41533a2

File tree

2 files changed

+0
-40
lines changed

2 files changed

+0
-40
lines changed

scripts/build/check_init_priorities.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@
4141
_DEVICE_INIT_LEVELS = ["EARLY", "PRE_KERNEL_1", "PRE_KERNEL_2", "POST_KERNEL",
4242
"APPLICATION", "SMP"]
4343

44-
# List of compatibles for node where the initialization priority should be the
45-
# opposite of the device tree inferred dependency.
46-
_INVERTED_PRIORITY_COMPATIBLES = frozenset()
47-
4844
# List of compatibles for nodes where we don't check the priority.
4945
_IGNORE_COMPATIBLES = frozenset([
5046
# There is no direct dependency between the CDC ACM UART and the USB
@@ -260,13 +256,6 @@ def _check_dep(self, dev_ord, dep_ord):
260256
self.log.info(f"Ignoring priority: {dev_node._binding.compatible}")
261257
return
262258

263-
if dev_node._binding and dep_node._binding:
264-
dev_compat = dev_node._binding.compatible
265-
dep_compat = dep_node._binding.compatible
266-
if (dev_compat, dep_compat) in _INVERTED_PRIORITY_COMPATIBLES:
267-
self.log.info(f"Swapped priority: {dev_compat}, {dep_compat}")
268-
dev_ord, dep_ord = dep_ord, dev_ord
269-
270259
dev_prio, dev_init = self._obj.devices.get(dev_ord, (None, None))
271260
dep_prio, dep_init = self._obj.devices.get(dep_ord, (None, None))
272261

scripts/build/check_init_priorities_test.py

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -332,35 +332,6 @@ def test_check_same_prio_assert(self, mock_vinit):
332332
with self.assertRaises(ValueError):
333333
validator._check_dep(1, 2)
334334

335-
@mock.patch("check_init_priorities.Validator.__init__", return_value=None)
336-
def test_check_swapped(self, mock_vinit):
337-
validator = check_init_priorities.Validator("", "", None)
338-
validator.log = mock.Mock()
339-
validator._obj = mock.Mock()
340-
validator.errors = 0
341-
342-
save_inverted_priorities = check_init_priorities._INVERTED_PRIORITY_COMPATIBLES
343-
344-
check_init_priorities._INVERTED_PRIORITY_COMPATIBLES = set([("compat-3", "compat-1")])
345-
346-
validator._ord2node = {1: mock.Mock(), 3: mock.Mock()}
347-
validator._ord2node[1]._binding.compatible = "compat-1"
348-
validator._ord2node[1].path = "/1"
349-
validator._ord2node[3]._binding.compatible = "compat-3"
350-
validator._ord2node[3].path = "/3"
351-
352-
validator._obj.devices = {1: (20, "i1"), 3: (10, "i3")}
353-
354-
validator._check_dep(3, 1)
355-
356-
self.assertListEqual(validator.log.info.call_args_list, [
357-
mock.call("Swapped priority: compat-3, compat-1"),
358-
mock.call("/3 <i1> 20 > /1 <i3> 10"),
359-
])
360-
self.assertEqual(validator.errors, 0)
361-
362-
check_init_priorities._INVERTED_PRIORITY_COMPATIBLES = save_inverted_priorities
363-
364335
@mock.patch("check_init_priorities.Validator.__init__", return_value=None)
365336
def test_check_ignored(self, mock_vinit):
366337
validator = check_init_priorities.Validator("", "", None)

0 commit comments

Comments
 (0)