Remove unneeded parameter from handle_light_switch_with_onOff_server_clusters

Also restore accidentally removed comment

Author: nickolas-deboom

drivers/SmartThings/matter-switch/src/init.lua

@@ -677,7 +677,7 @@ local function build_multicomponent_profile(device, main_endpoint, secondary_end
     profile_name = "switch-binary"
   end
 
-  if not battery_supported then
+  if not battery_supported then -- battery profiles are configured later, in power_source_attribute_list_handler
     profile_name = string.gsub(profile_name, "1%-", "") -- remove the "1-" in a device with 1 button ep
     device:try_update_metadata({profile = profile_name})
   end
@@ -721,33 +721,33 @@ local function build_child_switch_profiles(driver, device, switch_eps, main_endp
   return num_switch_server_eps
 end
 
-local function handle_light_switch_with_onOff_server_clusters(device, main_endpoint, num_switch_server_eps)
-    local cluster_id = 0
-    for _, ep in ipairs(device.endpoints) do
-      -- main_endpoint only supports server cluster by definition of get_endpoints()
-      if main_endpoint == ep.endpoint_id then
-        for _, dt in ipairs(ep.device_types) do
-          -- no device type that is not in the switch subset should be considered.
-          if (ON_OFF_SWITCH_ID <= dt.device_type_id and dt.device_type_id <= ON_OFF_COLOR_DIMMER_SWITCH_ID) then
-            cluster_id = math.max(cluster_id, dt.device_type_id)
-          end
+local function handle_light_switch_with_onOff_server_clusters(device, main_endpoint)
+  local cluster_id = 0
+  for _, ep in ipairs(device.endpoints) do
+    -- main_endpoint only supports server cluster by definition of get_endpoints()
+    if main_endpoint == ep.endpoint_id then
+      for _, dt in ipairs(ep.device_types) do
+        -- no device type that is not in the switch subset should be considered.
+        if (ON_OFF_SWITCH_ID <= dt.device_type_id and dt.device_type_id <= ON_OFF_COLOR_DIMMER_SWITCH_ID) then
+          cluster_id = math.max(cluster_id, dt.device_type_id)
         end
-        break
       end
+      break
     end
+  end
 
-    if device_type_profile_map[cluster_id] then
-      device:try_update_metadata({profile = device_type_profile_map[cluster_id]})
-    end
+  if device_type_profile_map[cluster_id] then
+    device:try_update_metadata({profile = device_type_profile_map[cluster_id]})
+  end
 end
 
 local function initialize_buttons_and_switches(driver, device, main_endpoint)
-  local switch_eps = device:get_endpoints(clusters.OnOff.ID)
   local button_eps = device:get_endpoints(clusters.Switch.ID, {feature_bitmap=clusters.Switch.types.SwitchFeature.MOMENTARY_SWITCH})
   local fan_eps = device:get_endpoints(clusters.FanControl.ID)
-  table.sort(switch_eps)
+  local switch_eps = device:get_endpoints(clusters.OnOff.ID)
   table.sort(button_eps)
   table.sort(fan_eps)
+  table.sort(switch_eps)
 
   if #button_eps > 0 then
     build_component_map(device, main_endpoint, button_eps, GENERIC_SWITCH_ID)
@@ -766,7 +766,7 @@ local function initialize_buttons_and_switches(driver, device, main_endpoint)
     -- However, this workaround profiles devices that claim to be Light Switches, but that break spec and implement OnOff as 'server'.
     -- Note: since their device type isn't supported, these devices join as a matter-thing.
     if num_switch_server_eps > 0 and detect_matter_thing(device) then
-      handle_light_switch_with_onOff_server_clusters(device, main_endpoint, num_switch_server_eps)
+      handle_light_switch_with_onOff_server_clusters(device, main_endpoint)
     end
   end