From 9d952d024273030245eb282b74e250df711385e4 Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Mon, 25 Oct 2021 12:23:11 +0200
Subject: [PATCH] Use DeviceInfo in control4 (#58388)

Co-authored-by: epenet <epenet@users.noreply.github.com>
---
 homeassistant/components/control4/__init__.py | 33 +++++++------------
 homeassistant/components/control4/light.py    |  3 --
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/homeassistant/components/control4/__init__.py b/homeassistant/components/control4/__init__.py
index e48f7fc0ccb..e57abfa3b73 100644
--- a/homeassistant/components/control4/__init__.py
+++ b/homeassistant/components/control4/__init__.py
@@ -20,6 +20,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import aiohttp_client, device_registry as dr
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -147,7 +148,6 @@ class Control4Entity(CoordinatorEntity):
     def __init__(
         self,
         entry_data: dict,
-        entry: ConfigEntry,
         coordinator: DataUpdateCoordinator,
         name: str,
         idx: int,
@@ -158,9 +158,9 @@ class Control4Entity(CoordinatorEntity):
     ) -> None:
         """Initialize a Control4 entity."""
         super().__init__(coordinator)
-        self.entry = entry
         self.entry_data = entry_data
-        self._name = name
+        self._attr_name = name
+        self._attr_unique_id = str(idx)
         self._idx = idx
         self._controller_unique_id = entry_data[CONF_CONTROLLER_UNIQUE_ID]
         self._device_name = device_name
@@ -169,23 +169,12 @@ class Control4Entity(CoordinatorEntity):
         self._device_id = device_id
 
     @property
-    def name(self):
-        """Return name of entity."""
-        return self._name
-
-    @property
-    def unique_id(self) -> str:
-        """Return a unique ID."""
-        return str(self._idx)
-
-    @property
-    def device_info(self):
+    def device_info(self) -> DeviceInfo:
         """Return info of parent Control4 device of entity."""
-        return {
-            "config_entry_id": self.entry.entry_id,
-            "identifiers": {(DOMAIN, self._device_id)},
-            "name": self._device_name,
-            "manufacturer": self._device_manufacturer,
-            "model": self._device_model,
-            "via_device": (DOMAIN, self._controller_unique_id),
-        }
+        return DeviceInfo(
+            identifiers={(DOMAIN, str(self._device_id))},
+            manufacturer=self._device_manufacturer,
+            model=self._device_model,
+            name=self._device_name,
+            via_device=(DOMAIN, self._controller_unique_id),
+        )
diff --git a/homeassistant/components/control4/light.py b/homeassistant/components/control4/light.py
index 38eca233f27..b2e5f6b43cf 100644
--- a/homeassistant/components/control4/light.py
+++ b/homeassistant/components/control4/light.py
@@ -122,7 +122,6 @@ async def async_setup_entry(
         entity_list.append(
             Control4Light(
                 entry_data,
-                entry,
                 item_coordinator,
                 item_name,
                 item_id,
@@ -143,7 +142,6 @@ class Control4Light(Control4Entity, LightEntity):
     def __init__(
         self,
         entry_data: dict,
-        entry: ConfigEntry,
         coordinator: DataUpdateCoordinator,
         name: str,
         idx: int,
@@ -156,7 +154,6 @@ class Control4Light(Control4Entity, LightEntity):
         """Initialize Control4 light entity."""
         super().__init__(
             entry_data,
-            entry,
             coordinator,
             name,
             idx,