From 4007430d7262ef035bb80affea13657fdc993b1d Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Tue, 8 Jun 2021 08:29:04 +0200
Subject: [PATCH] Small entity attribute cleanup in AirVisual (#51601)

* Small entity attribute cleanup in AirVisual

* Fix icon in sensor update
---
 homeassistant/components/airvisual/__init__.py    | 12 ------------
 homeassistant/components/airvisual/air_quality.py |  4 +---
 homeassistant/components/airvisual/sensor.py      | 15 ++++++---------
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/homeassistant/components/airvisual/__init__.py b/homeassistant/components/airvisual/__init__.py
index ac34c16d3d023e..8a1e0ad96554b3 100644
--- a/homeassistant/components/airvisual/__init__.py
+++ b/homeassistant/components/airvisual/__init__.py
@@ -337,24 +337,12 @@ def __init__(self, coordinator):
         """Initialize."""
         super().__init__(coordinator)
         self._attrs = {ATTR_ATTRIBUTION: DEFAULT_ATTRIBUTION}
-        self._icon = None
-        self._unit = None
 
     @property
     def extra_state_attributes(self):
         """Return the device state attributes."""
         return self._attrs
 
-    @property
-    def icon(self):
-        """Return the icon."""
-        return self._icon
-
-    @property
-    def unit_of_measurement(self):
-        """Return the unit the value is expressed in."""
-        return self._unit
-
     async def async_added_to_hass(self):
         """Register callbacks."""
 
diff --git a/homeassistant/components/airvisual/air_quality.py b/homeassistant/components/airvisual/air_quality.py
index 047367fa67c68c..175c129068fb10 100644
--- a/homeassistant/components/airvisual/air_quality.py
+++ b/homeassistant/components/airvisual/air_quality.py
@@ -1,6 +1,5 @@
 """Support for AirVisual Node/Pro units."""
 from homeassistant.components.air_quality import AirQualityEntity
-from homeassistant.const import CONCENTRATION_MICROGRAMS_PER_CUBIC_METER
 from homeassistant.core import callback
 
 from . import AirVisualEntity
@@ -34,8 +33,7 @@ def __init__(self, airvisual):
         """Initialize."""
         super().__init__(airvisual)
 
-        self._icon = "mdi:chemical-weapon"
-        self._unit = CONCENTRATION_MICROGRAMS_PER_CUBIC_METER
+        self._attr_icon = "mdi:chemical-weapon"
 
     @property
     def air_quality_index(self):
diff --git a/homeassistant/components/airvisual/sensor.py b/homeassistant/components/airvisual/sensor.py
index 1febcec68f4be8..ec8fe108b7fdff 100644
--- a/homeassistant/components/airvisual/sensor.py
+++ b/homeassistant/components/airvisual/sensor.py
@@ -154,12 +154,13 @@ def __init__(self, coordinator, config_entry, kind, name, icon, unit, locale):
             }
         )
         self._config_entry = config_entry
-        self._icon = icon
         self._kind = kind
         self._locale = locale
         self._name = name
         self._state = None
-        self._unit = unit
+
+        self._attr_icon = icon
+        self._attr_unit_of_measurement = unit
 
     @property
     def available(self):
@@ -196,7 +197,7 @@ def update_from_latest_data(self):
 
         if self._kind == SENSOR_KIND_LEVEL:
             aqi = data[f"aqi{self._locale}"]
-            self._state, self._icon = async_get_pollutant_level_info(aqi)
+            self._state, self._attr_icon = async_get_pollutant_level_info(aqi)
         elif self._kind == SENSOR_KIND_AQI:
             self._state = data[f"aqi{self._locale}"]
         elif self._kind == SENSOR_KIND_POLLUTANT:
@@ -244,16 +245,12 @@ def __init__(self, coordinator, kind, name, device_class, unit):
         """Initialize."""
         super().__init__(coordinator)
 
-        self._device_class = device_class
         self._kind = kind
         self._name = name
         self._state = None
-        self._unit = unit
 
-    @property
-    def device_class(self):
-        """Return the device class."""
-        return self._device_class
+        self._attr_device_class = device_class
+        self._attr_unit_of_measurement = unit
 
     @property
     def device_info(self):