From 42a86fe3330b0f6daac8ea52311963927510a1fb Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Wed, 22 Oct 2025 10:18:51 -1000
Subject: [PATCH] merge

---
 esphome/core/finite_set_mask.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/esphome/core/finite_set_mask.h b/esphome/core/finite_set_mask.h
index d3f0b52a71..f9cd0377c7 100644
--- a/esphome/core/finite_set_mask.h
+++ b/esphome/core/finite_set_mask.h
@@ -16,7 +16,7 @@ template<typename ValueType, int MaxBits> struct DefaultBitPolicy {
   using mask_t = typename std::conditional<(MaxBits <= 8), uint8_t,
                                            typename std::conditional<(MaxBits <= 16), uint16_t, uint32_t>::type>::type;
 
-  static constexpr int max_bits = MaxBits;
+  static constexpr int MAX_BITS = MaxBits;
 
   static constexpr unsigned to_bit(ValueType value) { return static_cast<unsigned>(value); }
 
@@ -32,7 +32,7 @@ template<typename ValueType, int MaxBits> struct DefaultBitPolicy {
 ///
 /// BitPolicy requirements:
 ///   - using mask_t = <uint8_t|uint16_t|uint32_t>  // Bitmask storage type
-///   - static constexpr int max_bits               // Maximum number of bits
+///   - static constexpr int MAX_BITS               // Maximum number of bits
 ///   - static constexpr unsigned to_bit(ValueType) // Convert value to bit position
 ///   - static constexpr ValueType from_bit(unsigned) // Convert bit position to value
 ///
@@ -155,10 +155,10 @@ template<typename ValueType, typename BitPolicy = DefaultBitPolicy<ValueType, 16
   }
 
   /// Find the next set bit in a bitmask starting from a given position
-  /// Returns the bit position, or max_bits if no more bits are set
+  /// Returns the bit position, or MAX_BITS if no more bits are set
   static constexpr int find_next_set_bit(bitmask_t mask, int start_bit) {
     int bit = start_bit;
-    while (bit < BitPolicy::max_bits && !(mask & (static_cast<bitmask_t>(1) << bit))) {
+    while (bit < BitPolicy::MAX_BITS && !(mask & (static_cast<bitmask_t>(1) << bit))) {
       ++bit;
     }
     return bit;