From 181a4519b873c4870fa81aa6c998fb97f98b6d51 Mon Sep 17 00:00:00 2001 From: tkdrob Date: Thu, 10 Jun 2021 03:56:35 -0400 Subject: [PATCH] Clean up unloads (#51688) --- homeassistant/components/modern_forms/__init__.py | 12 +----------- homeassistant/components/wallbox/__init__.py | 10 +--------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/homeassistant/components/modern_forms/__init__.py b/homeassistant/components/modern_forms/__init__.py index 7530f7658c7..3d5a7c50315 100644 --- a/homeassistant/components/modern_forms/__init__.py +++ b/homeassistant/components/modern_forms/__init__.py @@ -1,7 +1,6 @@ """The Modern Forms integration.""" from __future__ import annotations -import asyncio from datetime import timedelta import logging @@ -63,16 +62,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: """Unload Modern Forms config entry.""" - - # Unload entities for this entry/device. - unload_ok = all( - await asyncio.gather( - *( - hass.config_entries.async_forward_entry_unload(entry, platform) - for platform in PLATFORMS - ) - ) - ) + unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS) if unload_ok: del hass.data[DOMAIN][entry.entry_id] diff --git a/homeassistant/components/wallbox/__init__.py b/homeassistant/components/wallbox/__init__.py index 275ccddde33..63fe37732dc 100644 --- a/homeassistant/components/wallbox/__init__.py +++ b/homeassistant/components/wallbox/__init__.py @@ -1,5 +1,4 @@ """The Wallbox integration.""" -import asyncio from datetime import timedelta import logging @@ -115,14 +114,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry): """Unload a config entry.""" - unload_ok = all( - await asyncio.gather( - *[ - hass.config_entries.async_forward_entry_unload(entry, platform) - for platform in PLATFORMS - ] - ) - ) + unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS) if unload_ok: hass.data[DOMAIN]["connections"].pop(entry.entry_id)