From e2a68cc2d37ac425b692278748c677a21c3245e2 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Mon, 16 Mar 2026 12:44:33 -1000
Subject: [PATCH] Simplify: return drain result directly in loop()

---
 esphome/components/api/api_frame_helper_noise.cpp     | 4 +---
 esphome/components/api/api_frame_helper_plaintext.cpp | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/esphome/components/api/api_frame_helper_noise.cpp b/esphome/components/api/api_frame_helper_noise.cpp
index d73b1147c5..78e87793fc 100644
--- a/esphome/components/api/api_frame_helper_noise.cpp
+++ b/esphome/components/api/api_frame_helper_noise.cpp
@@ -154,9 +154,7 @@ APIError APINoiseFrameHelper::loop() {
   }
 
   if (!this->overflow_buf_.empty()) [[unlikely]] {
-    APIError err = this->drain_overflow_and_handle_errors_();
-    if (err != APIError::OK)
-      return err;
+    return this->drain_overflow_and_handle_errors_();
   }
   return APIError::OK;
 }
diff --git a/esphome/components/api/api_frame_helper_plaintext.cpp b/esphome/components/api/api_frame_helper_plaintext.cpp
index 1ed1b9c8e3..9e669b31ee 100644
--- a/esphome/components/api/api_frame_helper_plaintext.cpp
+++ b/esphome/components/api/api_frame_helper_plaintext.cpp
@@ -65,9 +65,7 @@ APIError APIPlaintextFrameHelper::loop() {
     return APIError::BAD_STATE;
   }
   if (!this->overflow_buf_.empty()) [[unlikely]] {
-    APIError err = this->drain_overflow_and_handle_errors_();
-    if (err != APIError::OK)
-      return err;
+    return this->drain_overflow_and_handle_errors_();
   }
   return APIError::OK;
 }