From fd93cf375dc477a5299cb873d090e99f2f602b94 Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Fri, 6 Jun 2025 09:41:51 +0200
Subject: [PATCH] Tweak zwave_js service registration (#146244)

---
 homeassistant/components/zwave_js/__init__.py | 7 ++-----
 homeassistant/components/zwave_js/services.py | 6 ++++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/zwave_js/__init__.py b/homeassistant/components/zwave_js/__init__.py
index abbf10fb494..0ad016cc2d4 100644
--- a/homeassistant/components/zwave_js/__init__.py
+++ b/homeassistant/components/zwave_js/__init__.py
@@ -133,7 +133,7 @@ from .helpers import (
     get_valueless_base_unique_id,
 )
 from .migrate import async_migrate_discovered_value
-from .services import ZWaveServices
+from .services import async_setup_services
 
 CONNECT_TIMEOUT = 10
 DATA_DRIVER_EVENTS = "driver_events"
@@ -177,10 +177,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
                 entry, unique_id=str(entry.unique_id)
             )
 
-    dev_reg = dr.async_get(hass)
-    ent_reg = er.async_get(hass)
-    services = ZWaveServices(hass, ent_reg, dev_reg)
-    services.async_register()
+    async_setup_services(hass)
 
     return True
 
diff --git a/homeassistant/components/zwave_js/services.py b/homeassistant/components/zwave_js/services.py
index 8389eff8cb2..33195fe6c8b 100644
--- a/homeassistant/components/zwave_js/services.py
+++ b/homeassistant/components/zwave_js/services.py
@@ -58,6 +58,12 @@ TARGET_VALIDATORS = {
 }
 
 
+def async_setup_services(hass: HomeAssistant) -> None:
+    """Register integration services."""
+    services = ZWaveServices(hass, er.async_get(hass), dr.async_get(hass))
+    services.async_register()
+
+
 def parameter_name_does_not_need_bitmask(
     val: dict[str, int | str | list[str]],
 ) -> dict[str, int | str | list[str]]: