diff --git a/homeassistant/components/cert_expiry/__init__.py b/homeassistant/components/cert_expiry/__init__.py index f5078219809..28a79a3e505 100644 --- a/homeassistant/components/cert_expiry/__init__.py +++ b/homeassistant/components/cert_expiry/__init__.py @@ -19,7 +19,4 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry): async def async_unload_entry(hass, entry): """Unload a config entry.""" - hass.async_create_task( - hass.config_entries.async_forward_entry_unload(entry, "sensor") - ) - return True + return await hass.config_entries.async_forward_entry_unload(entry, "sensor") diff --git a/homeassistant/components/linky/__init__.py b/homeassistant/components/linky/__init__.py index ad5b6743d37..1d382b43525 100644 --- a/homeassistant/components/linky/__init__.py +++ b/homeassistant/components/linky/__init__.py @@ -55,7 +55,4 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry): async def async_unload_entry(hass: HomeAssistantType, entry: ConfigEntry): """Unload Linky sensors.""" - hass.async_create_task( - hass.config_entries.async_forward_entry_unload(entry, "sensor") - ) - return True + return await hass.config_entries.async_forward_entry_unload(entry, "sensor") diff --git a/homeassistant/components/locative/__init__.py b/homeassistant/components/locative/__init__.py index 61e0b1f7474..ed8bcb6e7e5 100644 --- a/homeassistant/components/locative/__init__.py +++ b/homeassistant/components/locative/__init__.py @@ -127,8 +127,7 @@ async def async_unload_entry(hass, entry): """Unload a config entry.""" hass.components.webhook.async_unregister(entry.data[CONF_WEBHOOK_ID]) hass.data[DOMAIN]["unsub_device_tracker"].pop(entry.entry_id)() - await hass.config_entries.async_forward_entry_unload(entry, DEVICE_TRACKER) - return True + return await hass.config_entries.async_forward_entry_unload(entry, DEVICE_TRACKER) # pylint: disable=invalid-name diff --git a/homeassistant/components/luftdaten/__init__.py b/homeassistant/components/luftdaten/__init__.py index ac524502f8d..3dca82404c0 100644 --- a/homeassistant/components/luftdaten/__init__.py +++ b/homeassistant/components/luftdaten/__init__.py @@ -172,12 +172,9 @@ async def async_unload_entry(hass, config_entry): ) remove_listener() - for component in ("sensor",): - await hass.config_entries.async_forward_entry_unload(config_entry, component) - hass.data[DOMAIN][DATA_LUFTDATEN_CLIENT].pop(config_entry.entry_id) - return True + return await hass.config_entries.async_forward_entry_unload(config_entry, "sensor") class LuftDatenData: diff --git a/homeassistant/components/withings/__init__.py b/homeassistant/components/withings/__init__.py index ecefa681b87..baed9300d46 100644 --- a/homeassistant/components/withings/__init__.py +++ b/homeassistant/components/withings/__init__.py @@ -92,8 +92,4 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry): async def async_unload_entry(hass: HomeAssistantType, entry: ConfigEntry): """Unload Withings config entry.""" - await hass.async_create_task( - hass.config_entries.async_forward_entry_unload(entry, "sensor") - ) - - return True + return await hass.config_entries.async_forward_entry_unload(entry, "sensor")