From 841fa48186fb5abd31df1b5757cc9f618f024f5f Mon Sep 17 00:00:00 2001
From: Henning Kerstan <mail@henningkerstan.de>
Date: Mon, 2 Feb 2026 09:50:49 +0100
Subject: [PATCH] Replace hass.data[DATA_ENOCEAN] by config_entry.runtime_data
 (#161997)

---
 homeassistant/components/enocean/__init__.py | 18 +++++++++++-------
 homeassistant/components/enocean/const.py    |  2 --
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/homeassistant/components/enocean/__init__.py b/homeassistant/components/enocean/__init__.py
index c1db27c1c34..7c55f47a979 100644
--- a/homeassistant/components/enocean/__init__.py
+++ b/homeassistant/components/enocean/__init__.py
@@ -8,9 +8,11 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
-from .const import DATA_ENOCEAN, DOMAIN, ENOCEAN_DONGLE
+from .const import DOMAIN
 from .dongle import EnOceanDongle
 
+type EnOceanConfigEntry = ConfigEntry[EnOceanDongle]
+
 CONFIG_SCHEMA = vol.Schema(
     {DOMAIN: vol.Schema({vol.Required(CONF_DEVICE): cv.string})}, extra=vol.ALLOW_EXTRA
 )
@@ -36,21 +38,23 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     return True
 
 
-async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_setup_entry(
+    hass: HomeAssistant, config_entry: EnOceanConfigEntry
+) -> bool:
     """Set up an EnOcean dongle for the given entry."""
-    enocean_data = hass.data.setdefault(DATA_ENOCEAN, {})
     usb_dongle = EnOceanDongle(hass, config_entry.data[CONF_DEVICE])
     await usb_dongle.async_setup()
-    enocean_data[ENOCEAN_DONGLE] = usb_dongle
+    config_entry.runtime_data = usb_dongle
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, config_entry: EnOceanConfigEntry
+) -> bool:
     """Unload EnOcean config entry."""
 
-    enocean_dongle = hass.data[DATA_ENOCEAN][ENOCEAN_DONGLE]
+    enocean_dongle = config_entry.runtime_data
     enocean_dongle.unload()
-    hass.data.pop(DATA_ENOCEAN)
 
     return True
diff --git a/homeassistant/components/enocean/const.py b/homeassistant/components/enocean/const.py
index 0f3271655d8..8c469283074 100644
--- a/homeassistant/components/enocean/const.py
+++ b/homeassistant/components/enocean/const.py
@@ -5,8 +5,6 @@ import logging
 from homeassistant.const import Platform
 
 DOMAIN = "enocean"
-DATA_ENOCEAN = "enocean"
-ENOCEAN_DONGLE = "dongle"
 
 ERROR_INVALID_DONGLE_PATH = "invalid_dongle_path"