Remove non-used field from WiFi commissioning driver (#21048)

project-chip · Jul 21, 2022 · 83deb47 · 83deb47
1 parent 33aecf8
commit 83deb47
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 14 deletions.
diff --git a/src/include/platform/NetworkCommissioning.h b/src/include/platform/NetworkCommissioning.h
@@ -135,7 +135,7 @@ class BaseDriver
     public:
         /**
          * @brief Callback for the network driver pushing the event of network status change to the network commissioning cluster.
-         * The platforms is explected to push the status from operations such as autonomous connection after loss of connectivity or
+         * The platforms is expected to push the status from operations such as autonomous connection after loss of connectivity or
          * during initial establishment.
          *
          * This function must be called in a thread-safe manner with CHIP stack.

diff --git a/src/platform/Ameba/NetworkCommissioningDriver.h b/src/platform/Ameba/NetworkCommissioningDriver.h
@@ -127,7 +127,6 @@ class AmebaWiFiDriver final : public WiFiDriver
     bool NetworkMatch(const WiFiNetwork & network, ByteSpan networkId);
     CHIP_ERROR StartScanWiFiNetworks(ByteSpan ssid);
 
-    WiFiNetworkIterator mWiFiIterator = WiFiNetworkIterator(this);
     WiFiNetwork mSavedNetwork;
     WiFiNetwork mStagingNetwork;
     ScanCallback * mpScanCallback;

diff --git a/src/platform/EFR32/NetworkCommissioningWiFiDriver.h b/src/platform/EFR32/NetworkCommissioningWiFiDriver.h
@@ -134,9 +134,8 @@ class SlWiFiDriver final : public WiFiDriver
     bool StartScanWiFiNetworks(ByteSpan ssid);
     static void OnScanWiFiNetworkDone(wfx_wifi_scan_result_t * aScanResult);
 
-    WiFiNetworkIterator mWiFiIterator = WiFiNetworkIterator(this);
-    WiFiNetwork mSavedNetwork         = {};
-    WiFiNetwork mStagingNetwork       = {};
+    WiFiNetwork mSavedNetwork   = {};
+    WiFiNetwork mStagingNetwork = {};
     ScanCallback * mpScanCallback;
     ConnectCallback * mpConnectCallback;
 };

diff --git a/src/platform/ESP32/NetworkCommissioningDriver.h b/src/platform/ESP32/NetworkCommissioningDriver.h
@@ -127,7 +127,6 @@ class ESPWiFiDriver final : public WiFiDriver
     bool NetworkMatch(const WiFiNetwork & network, ByteSpan networkId);
     CHIP_ERROR StartScanWiFiNetworks(ByteSpan ssid);
 
-    WiFiNetworkIterator mWiFiIterator = WiFiNetworkIterator(this);
     WiFiNetwork mSavedNetwork;
     WiFiNetwork mStagingNetwork;
     ScanCallback * mpScanCallback;

diff --git a/src/platform/Linux/NetworkCommissioningDriver.h b/src/platform/Linux/NetworkCommissioningDriver.h
@@ -47,7 +47,7 @@ class LinuxScanResponseIterator : public Iterator<T>
 
 private:
     size_t currentIterating = 0;
-    // Note: We cannot post a event in ScheduleLambda since std::vector is not trivial copiable.
+    // Note: We cannot post a event in ScheduleLambda since std::vector is not trivial copyable.
     std::vector<T> * mpScanResponse;
 };
 
@@ -102,7 +102,6 @@ class LinuxWiFiDriver final : public WiFiDriver
 private:
     bool NetworkMatch(const WiFiNetwork & network, ByteSpan networkId);
 
-    WiFiNetworkIterator mWiFiIterator = WiFiNetworkIterator(this);
     WiFiNetwork mSavedNetwork;
     WiFiNetwork mStagingNetwork;
     Optional<Status> mScanStatus;

diff --git a/src/platform/P6/NetworkCommissioningDriver.h b/src/platform/P6/NetworkCommissioningDriver.h
@@ -133,7 +133,6 @@ class P6WiFiDriver final : public WiFiDriver
     bool NetworkMatch(const WiFiNetwork & network, ByteSpan networkId);
     CHIP_ERROR StartScanWiFiNetworks(ByteSpan ssid);
 
-    WiFiNetworkIterator mWiFiIterator = WiFiNetworkIterator(this);
     WiFiNetwork mSavedNetwork;
     WiFiNetwork mStagingNetwork;
     ScanCallback * mpScanCallback;

diff --git a/src/platform/Tizen/NetworkCommissioningDriver.h b/src/platform/Tizen/NetworkCommissioningDriver.h
@@ -74,7 +74,6 @@ class TizenWiFiDriver final : public WiFiDriver
 private:
     bool NetworkMatch(const WiFiNetwork & network, ByteSpan networkId);
 
-    WiFiNetworkIterator mWiFiIterator = WiFiNetworkIterator(this);
     WiFiNetwork mSavedNetwork;
     WiFiNetwork mStagingNetwork;
 };

diff --git a/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.h b/src/platform/bouffalolab/BL602/NetworkCommissioningDriver.h
@@ -129,7 +129,6 @@ class BLWiFiDriver final : public WiFiDriver
     bool NetworkMatch(const WiFiNetwork & network, ByteSpan networkId);
     CHIP_ERROR StartScanWiFiNetworks(ByteSpan ssid);
 
-    WiFiNetworkIterator mWiFiIterator = WiFiNetworkIterator(this);
     WiFiNetwork mSavedNetwork;
     WiFiNetwork mStagingNetwork;
     ScanCallback * mpScanCallback;

diff --git a/src/platform/mbed/NetworkCommissioningDriver.h b/src/platform/mbed/NetworkCommissioningDriver.h
@@ -143,7 +143,6 @@ class WiFiDriverImpl final : public WiFiDriver
 
     chip::DeviceLayer::Internal::WiFiAuthSecurityType NsapiToNetworkSecurity(nsapi_security_t nsapi_security);
 
-    WiFiNetworkIterator mWiFiIterator = WiFiNetworkIterator(this);
     WiFiNetwork mSavedNetwork;
     WiFiNetwork mStagingNetwork;
     ScanCallback * mScanCallback;

diff --git a/src/platform/webos/NetworkCommissioningDriver.h b/src/platform/webos/NetworkCommissioningDriver.h
@@ -47,7 +47,7 @@ class LinuxScanResponseIterator : public Iterator<T>
 
 private:
     size_t currentIterating = 0;
-    // Note: We cannot post a event in ScheduleLambda since std::vector is not trivial copiable.
+    // Note: We cannot post a event in ScheduleLambda since std::vector is not trivial copyable.
     std::vector<T> * mpScanResponse;
 };
 
@@ -102,7 +102,6 @@ class LinuxWiFiDriver final : public WiFiDriver
 private:
     bool NetworkMatch(const WiFiNetwork & network, ByteSpan networkId);
 
-    WiFiNetworkIterator mWiFiIterator = WiFiNetworkIterator(this);
     WiFiNetwork mSavedNetwork;
     WiFiNetwork mStagingNetwork;
     Optional<Status> mScanStatus;