From 908cedf981063d1ff228a70948e91bb6ec01ff11 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Mon, 5 Feb 2024 14:12:16 -0600 Subject: [PATCH] Avoid linear search of entity registry in async_clear_config_entry (#109724) --- homeassistant/helpers/entity_registry.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/homeassistant/helpers/entity_registry.py b/homeassistant/helpers/entity_registry.py index bab6ae245a7..dc0c29dc0b7 100644 --- a/homeassistant/helpers/entity_registry.py +++ b/homeassistant/helpers/entity_registry.py @@ -1218,9 +1218,8 @@ class EntityRegistry: """Clear config entry from registry entries.""" now_time = time.time() for entity_id in [ - entity_id - for entity_id, entry in self.entities.items() - if config_entry_id == entry.config_entry_id + entry.entity_id + for entry in self.entities.get_entries_for_config_entry_id(config_entry_id) ]: self.async_remove(entity_id) for key, deleted_entity in list(self.deleted_entities.items()):