From 0ae12ad08f4ffc6e1560665a44846784c79645d7 Mon Sep 17 00:00:00 2001
From: Joost Lekkerkerker <joostlek@outlook.com>
Date: Tue, 5 Sep 2023 15:27:38 +0200
Subject: [PATCH] Use shorthand attributes in Logi circle (#99592)

---
 .../components/logi_circle/camera.py          | 27 +++++++------------
 .../components/logi_circle/sensor.py          | 14 ++++------
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/homeassistant/components/logi_circle/camera.py b/homeassistant/components/logi_circle/camera.py
index 5c27d2a08ae..d1ea01e864c 100644
--- a/homeassistant/components/logi_circle/camera.py
+++ b/homeassistant/components/logi_circle/camera.py
@@ -71,10 +71,17 @@ class LogiCam(Camera):
         """Initialize Logi Circle camera."""
         super().__init__()
         self._camera = camera
-        self._id = self._camera.mac_address
-        self._has_battery = self._camera.supports_feature("battery_level")
+        self._has_battery = camera.supports_feature("battery_level")
         self._ffmpeg = ffmpeg
         self._listeners = []
+        self._attr_unique_id = camera.mac_address
+        self._attr_device_info = DeviceInfo(
+            identifiers={(LOGI_CIRCLE_DOMAIN, camera.id)},
+            manufacturer=DEVICE_BRAND,
+            model=camera.model_name,
+            name=camera.name,
+            sw_version=camera.firmware,
+        )
 
     async def async_added_to_hass(self) -> None:
         """Connect camera methods to signals."""
@@ -117,22 +124,6 @@ class LogiCam(Camera):
         for detach in self._listeners:
             detach()
 
-    @property
-    def unique_id(self):
-        """Return a unique ID."""
-        return self._id
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return information about the device."""
-        return DeviceInfo(
-            identifiers={(LOGI_CIRCLE_DOMAIN, self._camera.id)},
-            manufacturer=DEVICE_BRAND,
-            model=self._camera.model_name,
-            name=self._camera.name,
-            sw_version=self._camera.firmware,
-        )
-
     @property
     def extra_state_attributes(self):
         """Return the state attributes."""
diff --git a/homeassistant/components/logi_circle/sensor.py b/homeassistant/components/logi_circle/sensor.py
index 32082b794b7..d06569a19ca 100644
--- a/homeassistant/components/logi_circle/sensor.py
+++ b/homeassistant/components/logi_circle/sensor.py
@@ -106,16 +106,12 @@ class LogiSensor(SensorEntity):
         self._attr_unique_id = f"{camera.mac_address}-{description.key}"
         self._activity: dict[Any, Any] = {}
         self._tz = time_zone
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return information about the device."""
-        return DeviceInfo(
-            identifiers={(LOGI_CIRCLE_DOMAIN, self._camera.id)},
+        self._attr_device_info = DeviceInfo(
+            identifiers={(LOGI_CIRCLE_DOMAIN, camera.id)},
             manufacturer=DEVICE_BRAND,
-            model=self._camera.model_name,
-            name=self._camera.name,
-            sw_version=self._camera.firmware,
+            model=camera.model_name,
+            name=camera.name,
+            sw_version=camera.firmware,
         )
 
     @property