From 495a0e9c127bd9cbea4de7b80b7caf2f1efaaf24 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@apple.com>
Date: Thu, 13 Jul 2023 14:28:16 -0400
Subject: [PATCH] Remove dead-code init callbacks from some clusters. (#27936)

Init callbacks are only called for clusters listed in
ClustersWithInitFunctions.  "Basic" was not the right name for "Basic
Information", so that one was effectively not listed, and neither "Refrigerator
Alarm" nor "Group Key Management" were listed.
---
 src/app/clusters/basic-information/basic-information.cpp        | 2 --
 .../clusters/group-key-mgmt-server/group-key-mgmt-server.cpp    | 2 --
 .../refrigerator-alarm-server/refrigerator-alarm-server.cpp     | 2 --
 src/app/common/templates/config-data.yaml                       | 1 -
 4 files changed, 7 deletions(-)

diff --git a/src/app/clusters/basic-information/basic-information.cpp b/src/app/clusters/basic-information/basic-information.cpp
index 57f297f1e1c4ad..3429978fdc20a8 100644
--- a/src/app/clusters/basic-information/basic-information.cpp
+++ b/src/app/clusters/basic-information/basic-information.cpp
@@ -439,8 +439,6 @@ bool IsLocalConfigDisabled()
 } // namespace app
 } // namespace chip
 
-void emberAfBasicInformationClusterServerInitCallback(chip::EndpointId endpoint) {}
-
 void MatterBasicInformationPluginServerInitCallback()
 {
     registerAttributeAccessOverride(&gAttrAccess);
diff --git a/src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp b/src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp
index ec2208e056f993..9f29d0b25a6966 100644
--- a/src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp
+++ b/src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp
@@ -300,8 +300,6 @@ void MatterGroupKeyManagementPluginServerInitCallback()
 // Commands
 //
 
-void emberAfGroupKeyManagementClusterServerInitCallback(chip::EndpointId endpoint) {}
-
 bool emberAfGroupKeyManagementClusterKeySetWriteCallback(
     chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
     const chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::DecodableType & commandData)
diff --git a/src/app/clusters/refrigerator-alarm-server/refrigerator-alarm-server.cpp b/src/app/clusters/refrigerator-alarm-server/refrigerator-alarm-server.cpp
index ea609dd9578645..aefc65ecd8a05a 100644
--- a/src/app/clusters/refrigerator-alarm-server/refrigerator-alarm-server.cpp
+++ b/src/app/clusters/refrigerator-alarm-server/refrigerator-alarm-server.cpp
@@ -197,6 +197,4 @@ void RefrigeratorAlarmServer::SendNotifyEvent(EndpointId endpointId, BitMask<Ala
  * Callbacks Implementation
  *********************************************************/
 
-void emberAfRefrigeratorAlarmClusterServerInitCallback(EndpointId endpoint) {}
-
 void MatterRefrigeratorAlarmPluginServerInitCallback() {}
diff --git a/src/app/common/templates/config-data.yaml b/src/app/common/templates/config-data.yaml
index 5f282138891ad7..d9b620e173f4ef 100644
--- a/src/app/common/templates/config-data.yaml
+++ b/src/app/common/templates/config-data.yaml
@@ -29,7 +29,6 @@ CommandHandlerInterfaceOnlyClusters:
 # We need a more configurable way of deciding which clusters have which init functions....
 # See https://github.com/project-chip/connectedhomeip/issues/4369
 ClustersWithInitFunctions:
-    - Basic
     - Color Control
     - Groups
     - Identify