From 4e89c2322beb96b653ce70bb44fc983885a015fc Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Fri, 24 Jan 2025 11:26:09 +0100
Subject: [PATCH] Simplify update listener in denonavr (#136422)

---
 homeassistant/components/denonavr/__init__.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/homeassistant/components/denonavr/__init__.py b/homeassistant/components/denonavr/__init__.py
index 24d119e4be7..a0ef454cc2d 100644
--- a/homeassistant/components/denonavr/__init__.py
+++ b/homeassistant/components/denonavr/__init__.py
@@ -29,7 +29,6 @@ from .const import (
 from .receiver import ConnectDenonAVR
 
 CONF_RECEIVER = "receiver"
-UNDO_UPDATE_LISTENER = "undo_update_listener"
 PLATFORMS = [Platform.MEDIA_PLAYER]
 
 _LOGGER = logging.getLogger(__name__)
@@ -56,11 +55,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         raise ConfigEntryNotReady from ex
     receiver = connect_denonavr.receiver
 
-    undo_listener = entry.add_update_listener(update_listener)
+    entry.async_on_unload(entry.add_update_listener(update_listener))
 
     hass.data[DOMAIN][entry.entry_id] = {
         CONF_RECEIVER: receiver,
-        UNDO_UPDATE_LISTENER: undo_listener,
     }
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
@@ -89,8 +87,6 @@ async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
         receiver: DenonAVR = hass.data[DOMAIN][config_entry.entry_id][CONF_RECEIVER]
         await receiver.async_telnet_disconnect()
 
-    hass.data[DOMAIN][config_entry.entry_id][UNDO_UPDATE_LISTENER]()
-
     # Remove zone2 and zone3 entities if needed
     entity_registry = er.async_get(hass)
     entries = er.async_entries_for_config_entry(entity_registry, config_entry.entry_id)