Cleanup of knx component (#12408)

homeassistant/components/binary_sensor/knx.py

@@ -56,9 +56,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 @asyncio.coroutine
 def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     """Set up binary sensor(s) for KNX platform."""
-    if DATA_KNX not in hass.data or not hass.data[DATA_KNX].initialized:
-        return
-
     if discovery_info is not None:
         async_add_devices_discovery(hass, discovery_info, async_add_devices)
     else:

homeassistant/components/climate/knx.py

@@ -64,9 +64,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 @asyncio.coroutine
 def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     """Set up climate(s) for KNX platform."""
-    if DATA_KNX not in hass.data or not hass.data[DATA_KNX].initialized:
-        return
-
     if discovery_info is not None:
         async_add_devices_discovery(hass, discovery_info, async_add_devices)
     else:

homeassistant/components/cover/knx.py

@@ -53,9 +53,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 @asyncio.coroutine
 def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     """Set up cover(s) for KNX platform."""
-    if DATA_KNX not in hass.data or not hass.data[DATA_KNX].initialized:
-        return
-
     if discovery_info is not None:
         async_add_devices_discovery(hass, discovery_info, async_add_devices)
     else:

homeassistant/components/knx.py

@@ -120,7 +120,6 @@ class KNXModule(object):
         self.hass = hass
         self.config = config
         self.connected = False
-        self.initialized = True
         self.init_xknx()
         self.register_callbacks()
 

homeassistant/components/light/knx.py

@@ -40,10 +40,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 @asyncio.coroutine
 def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     """Set up lights for KNX platform."""
-    if DATA_KNX not in hass.data \
-            or not hass.data[DATA_KNX].initialized:
-        return
-
     if discovery_info is not None:
         async_add_devices_discovery(hass, discovery_info, async_add_devices)
     else:

homeassistant/components/notify/knx.py

@@ -27,10 +27,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 @asyncio.coroutine
 def async_get_service(hass, config, discovery_info=None):
     """Get the KNX notification service."""
-    if DATA_KNX not in hass.data \
-            or not hass.data[DATA_KNX].initialized:
-        return False
-
     return async_get_service_discovery(hass, discovery_info) \
         if discovery_info is not None else \
         async_get_service_config(hass, config)
@@ -44,7 +40,7 @@ def async_get_service_discovery(hass, discovery_info):
         device = hass.data[DATA_KNX].xknx.devices[device_name]
         notification_devices.append(device)
     return \
-        KNXNotificationService(hass, notification_devices) \
+        KNXNotificationService(notification_devices) \
         if notification_devices else \
         None
 
@@ -58,15 +54,14 @@ def async_get_service_config(hass, config):
         name=config.get(CONF_NAME),
         group_address=config.get(CONF_ADDRESS))
     hass.data[DATA_KNX].xknx.devices.add(notification)
-    return KNXNotificationService(hass, [notification, ])
+    return KNXNotificationService([notification, ])
 
 
 class KNXNotificationService(BaseNotificationService):
     """Implement demo notification service."""
 
-    def __init__(self, hass, devices):
+    def __init__(self, devices):
         """Initialize the service."""
-        self.hass = hass
         self.devices = devices
 
     @property

homeassistant/components/sensor/knx.py

@@ -31,9 +31,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 @asyncio.coroutine
 def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     """Set up sensor(s) for KNX platform."""
-    if DATA_KNX not in hass.data or not hass.data[DATA_KNX].initialized:
-        return
-
     if discovery_info is not None:
         async_add_devices_discovery(hass, discovery_info, async_add_devices)
     else:

homeassistant/components/switch/knx.py

@@ -30,9 +30,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 @asyncio.coroutine
 def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     """Set up switch(es) for KNX platform."""
-    if DATA_KNX not in hass.data or not hass.data[DATA_KNX].initialized:
-        return
-
     if discovery_info is not None:
         async_add_devices_discovery(hass, discovery_info, async_add_devices)
     else: