Use entry.async_on_unload in monoprice (home-assistant#148016)

Author: epenet

homeassistant/components/monoprice/__init__.py

@@ -10,13 +10,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 
-from .const import (
-    CONF_NOT_FIRST_RUN,
-    DOMAIN,
-    FIRST_RUN,
-    MONOPRICE_OBJECT,
-    UNDO_UPDATE_LISTENER,
-)
+from .const import CONF_NOT_FIRST_RUN, DOMAIN, FIRST_RUN, MONOPRICE_OBJECT
 
 PLATFORMS = [Platform.MEDIA_PLAYER]
 
@@ -41,11 +35,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             entry, data={**entry.data, CONF_NOT_FIRST_RUN: True}
         )
 
-    undo_listener = entry.add_update_listener(_update_listener)
+    entry.async_on_unload(entry.add_update_listener(_update_listener))
 
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = {
         MONOPRICE_OBJECT: monoprice,
-        UNDO_UPDATE_LISTENER: undo_listener,
         FIRST_RUN: first_run,
     }
 
@@ -60,8 +53,6 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     if not unload_ok:
         return False
 
-    hass.data[DOMAIN][entry.entry_id][UNDO_UPDATE_LISTENER]()
-
     def _cleanup(monoprice) -> None:
         """Destroy the Monoprice object.
 

homeassistant/components/monoprice/const.py

@@ -18,4 +18,3 @@
 
 FIRST_RUN = "first_run"
 MONOPRICE_OBJECT = "monoprice_object"
-UNDO_UPDATE_LISTENER = "update_update_listener"