From d772488472c008ba2e671683fda9402c491786b6 Mon Sep 17 00:00:00 2001
From: Chris Talkington <chris@talkingtontech.com>
Date: Sun, 20 Jun 2021 23:38:45 -0500
Subject: [PATCH] Remove undo listener variable in sonarr (#52042)

---
 homeassistant/components/sonarr/__init__.py | 6 +-----
 homeassistant/components/sonarr/const.py    | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/homeassistant/components/sonarr/__init__.py b/homeassistant/components/sonarr/__init__.py
index 08fc2c7f26d..f0969d063c1 100644
--- a/homeassistant/components/sonarr/__init__.py
+++ b/homeassistant/components/sonarr/__init__.py
@@ -23,7 +23,6 @@ from .const import (
     CONF_UPCOMING_DAYS,
     CONF_WANTED_MAX_ITEMS,
     DATA_SONARR,
-    DATA_UNDO_UPDATE_LISTENER,
     DEFAULT_UPCOMING_DAYS,
     DEFAULT_WANTED_MAX_ITEMS,
     DOMAIN,
@@ -66,12 +65,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     except SonarrError as err:
         raise ConfigEntryNotReady from err
 
-    undo_listener = entry.add_update_listener(_async_update_listener)
+    entry.async_on_unload(entry.add_update_listener(_async_update_listener))
 
     hass.data.setdefault(DOMAIN, {})
     hass.data[DOMAIN][entry.entry_id] = {
         DATA_SONARR: sonarr,
-        DATA_UNDO_UPDATE_LISTENER: undo_listener,
     }
 
     hass.config_entries.async_setup_platforms(entry, PLATFORMS)
@@ -83,8 +81,6 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
     unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
-    hass.data[DOMAIN][entry.entry_id][DATA_UNDO_UPDATE_LISTENER]()
-
     if unload_ok:
         hass.data[DOMAIN].pop(entry.entry_id)
 
diff --git a/homeassistant/components/sonarr/const.py b/homeassistant/components/sonarr/const.py
index 52079a9416c..45b26166c92 100644
--- a/homeassistant/components/sonarr/const.py
+++ b/homeassistant/components/sonarr/const.py
@@ -17,7 +17,6 @@ CONF_WANTED_MAX_ITEMS = "wanted_max_items"
 
 # Data
 DATA_SONARR = "sonarr"
-DATA_UNDO_UPDATE_LISTENER = "undo_update_listener"
 
 # Defaults
 DEFAULT_BASE_PATH = "/api"