1 files changed, 2 insertions, 6 deletions
diff --git a/init/firmware_handler.h b/init/firmware_handler.h
index 3c35b1f16..b4138f127 100644
--- a/init/firmware_handler.h
+++ b/init/firmware_handler.h
@@ -18,7 +18,6 @@
 
 #include <pwd.h>
 
-#include <functional>
 #include <string>
 #include <vector>
 
@@ -30,13 +29,11 @@ namespace android {
 namespace init {
 
 struct ExternalFirmwareHandler {
-    ExternalFirmwareHandler(std::string devpath, uid_t uid, std::string handler_path);
-
+    ExternalFirmwareHandler(std::string devpath, uid_t uid, std::string handler_path)
+        : devpath(std::move(devpath)), uid(uid), handler_path(std::move(handler_path)) {}
     std::string devpath;
     uid_t uid;
     std::string handler_path;
-
-    std::function<bool(const std::string&)> match;
 };
 
 class FirmwareHandler : public UeventHandler {
@@ -55,7 +52,6 @@ class FirmwareHandler : public UeventHandler {
                                            const Uevent& uevent) const;
     std::string GetFirmwarePath(const Uevent& uevent) const;
     void ProcessFirmwareEvent(const std::string& root, const std::string& firmware) const;
-    bool ForEachFirmwareDirectory(std::function<bool(const std::string&)> handler) const;
 
     std::vector<std::string> firmware_directories_;
     std::vector<ExternalFirmwareHandler> external_firmware_handlers_;