cleanup unnessary changes

Author: sabollim-silabs

examples/closure-app/silabs/src/ClosureManager.cpp

@@ -632,27 +632,20 @@ chip::Protocols::InteractionModel::Status ClosureManager::OnMoveToCommand(const
         }
     }
 
-    if (mClosurePanelEndpoint2.GetLogic().SetTargetState(DataModel::MakeNullable(mClosurePanelEndpoint2Target)) != CHIP_NO_ERROR)
-    {
-        ChipLogError(AppServer, "Failed to set target for Endpoint 2");
-        return Status::Failure;
-    }
-
-    if (mClosurePanelEndpoint3.GetLogic().SetTargetState(DataModel::MakeNullable(mClosurePanelEndpoint3Target)) != CHIP_NO_ERROR)
-    {
-        ChipLogError(AppServer, "Failed to set target for Endpoint 3");
-        return Status::Failure;
-    }
+    VerifyOrReturnError(mClosurePanelEndpoint2.GetLogic().SetTargetState(DataModel::MakeNullable(mClosurePanelEndpoint2Target)) ==
+                            CHIP_NO_ERROR,
+                        Status::Failure, ChipLogError(AppServer, "Failed to set target for Endpoint 2"));
+    VerifyOrReturnError(mClosurePanelEndpoint3.GetLogic().SetTargetState(DataModel::MakeNullable(mClosurePanelEndpoint3Target)) ==
+                            CHIP_NO_ERROR,
+                        Status::Failure, ChipLogError(AppServer, "Failed to set target for Endpoint 3"));
 
-    if (mClosureEndpoint1.GetLogic().SetCountdownTimeFromDelegate(kDefaultCountdownTimeSeconds) != CHIP_NO_ERROR)
-    {
-        ChipLogError(AppServer, "Failed to set countdown time for move to command on Endpoint 1");
-        return Status::Failure;
-    }
+    VerifyOrReturnError(mClosureEndpoint1.GetLogic().SetCountdownTimeFromDelegate(kDefaultCountdownTimeSeconds) == CHIP_NO_ERROR,
+                        Status::Failure, ChipLogError(AppServer, "Failed to set countdown time for move to command on Endpoint 1"));
 
     // Set the current action to UNLATCH_ACTION if Latching feature is supported.
     // This is to ensure that the closure is unlatched before starting the motion action.
     // The Closure Control Cluster will handle the unlatch action before proceeding with the motion action.
+    DeviceLayer::PlatformMgr().LockChipStack();
     if (mClosureEndpoint1.GetLogic().GetConformance().HasFeature(ClosureControl::Feature::kMotionLatching))
     {
         SetCurrentAction(UNLATCH_ACTION);
@@ -662,6 +655,7 @@ chip::Protocols::InteractionModel::Status ClosureManager::OnMoveToCommand(const
         SetCurrentAction(MOVE_TO_ACTION);
     }
     mIsMoveToInProgress = true;
+    DeviceLayer::PlatformMgr().UnlockChipStack();
 
     // Post an event to initiate the move to action asynchronously.
     // MoveTo Command can only be initiated from Closure Control Endpoint (Endpoint 1).
@@ -821,12 +815,8 @@ chip::Protocols::InteractionModel::Status ClosureManager::OnSetTargetCommand(con
                                                                              const chip::EndpointId endpointId)
 {
     MainStateEnum mClosureEndpoint1MainState;
-    if (mClosureEndpoint1.GetLogic().GetMainState(mClosureEndpoint1MainState) != CHIP_NO_ERROR)
-    {
-        ChipLogError(AppServer, "Failed to get main state for SetTarget command on Endpoint 1");
-        return Status::Failure;
-    }
-
+    VerifyOrReturnError(mClosureEndpoint1.GetLogic().GetMainState(mClosureEndpoint1MainState) == CHIP_NO_ERROR, Status::Failure,
+    ChipLogError(AppServer, "Failed to get main state for SetTarget command on Endpoint 1"));
 
     // If this command is received while the MainState attribute is currently either in Disengaged, Protected, Calibrating,
     //  SetupRequired or Error, then a status code of INVALID_IN_STATE shall be returned.
@@ -1110,18 +1100,9 @@ chip::Protocols::InteractionModel::Status ClosureManager::OnStepCommand(const St
                                                                         const Optional<Globals::ThreeLevelAutoEnum> & speed,
                                                                         const chip::EndpointId & endpointId)
 {
-    // Lock chip stack to safely access cluster state
-    DeviceLayer::PlatformMgr().LockChipStack();
-
     MainStateEnum mClosureEndpoint1MainState;
-    if (mClosureEndpoint1.GetLogic().GetMainState(mClosureEndpoint1MainState) != CHIP_NO_ERROR)
-    {
-        DeviceLayer::PlatformMgr().UnlockChipStack();
-        ChipLogError(AppServer, "Failed to get main state for Step command on Endpoint 1");
-        return Status::Failure;
-    }
-
-    DeviceLayer::PlatformMgr().UnlockChipStack();
+    VerifyOrReturnError(mClosureEndpoint1.GetLogic().GetMainState(mClosureEndpoint1MainState) == CHIP_NO_ERROR, Status::Failure,
+                        ChipLogError(AppServer, "Failed to get main state for Step command on Endpoint 1"));
 
     // If this command is received while the MainState attribute is currently either in Disengaged, Protected, Calibrating,
     //  SetupRequired or Error, then a status code of INVALID_IN_STATE shall be returned.