CHAD-17092: Removed redundant loading of drivers in can_handle's with multiple loads

Author: aleclorimer

drivers/SmartThings/zwave-sensor/src/aeotec-multisensor/can_handle.lua

@@ -6,7 +6,7 @@ local function can_handle_aeotec_multisensor(opts, self, device, ...)
   for _, fingerprint in ipairs(FINGERPRINTS) do
     if device:id_match(fingerprint.manufacturerId, fingerprint.productType, fingerprint.productId) then
       local subdriver = require("aeotec-multisensor")
-      return true, subdriver, require("aeotec-multisensor")
+      return true, subdriver
     end
   end
   return false

drivers/SmartThings/zwave-sensor/src/aeotec-water-sensor/can_handle.lua

@@ -6,7 +6,7 @@ local function can_handle_zwave_water_temp_humidity_sensor(opts, driver, device,
   for _, fingerprint in ipairs(FINGERPRINTS) do
     if device:id_match(fingerprint.manufacturerId, fingerprint.productType, fingerprint.productId) then
       local subdriver = require("aeotec-water-sensor")
-      return true, subdriver, require("aeotec-water-sensor")
+      return true, subdriver
     end
   end
   return false

drivers/SmartThings/zwave-sensor/src/enerwave-motion-sensor/can_handle.lua

@@ -5,7 +5,7 @@ local function can_handle_enerwave_motion_sensor(opts, driver, device, cmd, ...)
   local ENERWAVE_MFR = 0x011A
   if device.zwave_manufacturer_id == ENERWAVE_MFR then
     local subdriver = require("enerwave-motion-sensor")
-    return true, subdriver, require("enerwave-motion-sensor")
+    return true, subdriver
   else return false end
 end
 

drivers/SmartThings/zwave-sensor/src/fibaro-door-window-sensor/can_handle.lua

@@ -6,7 +6,7 @@ local function can_handle_fibaro_door_window_sensor(opts, driver, device, ...)
   for _, fingerprint in ipairs(FINGERPRINTS) do
     if device:id_match(fingerprint.manufacturerId, fingerprint.prod, fingerprint.productId) then
       local subdriver = require("fibaro-door-window-sensor")
-      return true, subdriver, require("fibaro-door-window-sensor")
+      return true, subdriver
     end
   end
   return false

drivers/SmartThings/zwave-sensor/src/fibaro-motion-sensor/can_handle.lua

@@ -7,7 +7,7 @@ local function can_handle_fibaro_motion_sensor(opts, driver, device, ...)
   local FIBARO_MOTION_PROD = 0x0800
   if device:id_match(FIBARO_MOTION_MFR, FIBARO_MOTION_PROD) then
     local subdriver = require("fibaro-motion-sensor")
-    return true, subdriver, require("fibaro-motion-sensor")
+    return true, subdriver
   end
   return false
 end

drivers/SmartThings/zwave-sensor/src/sensative-strip/can_handle.lua

@@ -6,7 +6,7 @@ local function can_handle_sensative_strip(opts, driver, device, cmd, ...)
   local SENSATIVE_MODEL = 0x000A
   if device:id_match(SENSATIVE_MFR, nil, SENSATIVE_MODEL) then
     local subdriver = require("sensative-strip")
-    return true, subdriver, require("sensative-strip")
+    return true, subdriver
   end
   return false
 end

drivers/SmartThings/zwave-sensor/src/v1-contact-event/can_handle.lua

@@ -13,7 +13,7 @@ local function can_handle_v1_contact_event(opts, driver, device, cmd, ...)
     cmd.args.notification_type == Notification.notification_type.HOME_SECURITY and
     cmd.args.v1_alarm_type == 0x07 then
       local subdriver = require("v1-contact-event")
-      return true, subdriver, require("v1-contact-event")
+      return true, subdriver
     else
       return false
     end

drivers/SmartThings/zwave-sensor/src/zooz-4-in-1-sensor/can_handle.lua

@@ -6,7 +6,7 @@ local function can_handle_zooz_4_in_1_sensor(opts, driver, device, ...)
   for _, fingerprint in ipairs(FINGERPRINTS) do
     if device:id_match(fingerprint.manufacturerId, fingerprint.productType, fingerprint.productId) then
       local subdriver = require("zooz-4-in-1-sensor")
-      return true, subdriver, require("zooz-4-in-1-sensor")
+      return true, subdriver
     end
   end
   return false

drivers/SmartThings/zwave-sensor/src/zwave-water-leak-sensor/can_handle.lua

@@ -6,7 +6,7 @@ local function can_handle_water_leak_sensor(opts, driver, device, ...)
   for _, fingerprint in ipairs(FINGERPRINTS) do
     if device:id_match(fingerprint.mfr, fingerprint.prod, fingerprint.model) then
       local subdriver = require("zwave-water-leak-sensor")
-      return true, subdriver, require("zwave-water-leak-sensor")
+      return true, subdriver
     end
   end
   return false