diff --git a/src/data-model-providers/codegen/EmberMetadata.cpp b/src/data-model-providers/codegen/EmberMetadata.cpp index 3410cda64c081d..57a9b48e561d41 100644 --- a/src/data-model-providers/codegen/EmberMetadata.cpp +++ b/src/data-model-providers/codegen/EmberMetadata.cpp @@ -36,11 +36,16 @@ FindAttributeMetadata(const ConcreteAttributePath & aPath) if (metadata == nullptr) { - Status status = ValidateClusterPath(aPath); + const EmberAfEndpointType * type = emberAfFindEndpointType(aPath.mEndpointId); + if (type == nullptr) + { + return Status::UnsupportedEndpoint; + } - if (status != Status::Success) + const EmberAfCluster * cluster = emberAfFindClusterInType(type, aPath.mClusterId, CLUSTER_MASK_SERVER); + if (cluster == nullptr) { - return status; + return Status::UnsupportedCluster; } // Since we know the attribute is unsupported and the endpoint/cluster are @@ -51,24 +56,6 @@ FindAttributeMetadata(const ConcreteAttributePath & aPath) return metadata; } -Status ValidateClusterPath(const ConcreteClusterPath & path) -{ - - const EmberAfEndpointType * type = emberAfFindEndpointType(path.mEndpointId); - if (type == nullptr) - { - return Status::UnsupportedEndpoint; - } - - const EmberAfCluster * cluster = emberAfFindClusterInType(type, path.mClusterId, CLUSTER_MASK_SERVER); - if (cluster == nullptr) - { - return Status::UnsupportedCluster; - } - - return Status::Success; -} - } // namespace Ember } // namespace app } // namespace chip diff --git a/src/data-model-providers/codegen/EmberMetadata.h b/src/data-model-providers/codegen/EmberMetadata.h index 14c8894290ac03..ecf6aa202fc78d 100644 --- a/src/data-model-providers/codegen/EmberMetadata.h +++ b/src/data-model-providers/codegen/EmberMetadata.h @@ -41,14 +41,6 @@ std::variant FindAttributeMetadata(const ConcreteAttributePath & aPath); -/// Returns the status for a given cluster existing in the ember metadata. -/// -/// Return code will be one of: -/// - Status::UnsupportedEndpoint if the path endpoint does not exist -/// - Status::UnsupportedCluster if the cluster does not exist on the given endpoint -/// - Status::Success if the cluster exists in the ember metadata. -Protocols::InteractionModel::Status ValidateClusterPath(const ConcreteClusterPath & path); - } // namespace Ember } // namespace app } // namespace chip