From 8bc5f7884e8c087f4d5c34650f314fe12e06ff08 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Thu, 3 Jan 2013 12:40:00 +0200
Subject: [PATCH] core: Introduce an adapter_cleanup() function

---
 src/adapter.c | 5 +++++
 src/adapter.h | 2 ++
 src/main.c    | 2 +-
 src/manager.c | 2 +-
 src/manager.h | 2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/adapter.c b/src/adapter.c
index 31a6b514a..1f3247e79 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -3615,3 +3615,8 @@ void btd_adapter_for_each_device(struct btd_adapter *adapter,
 {
 	g_slist_foreach(adapter->devices, (GFunc) cb, data);
 }
+
+void adapter_cleanup(void)
+{
+	manager_cleanup();
+}
diff --git a/src/adapter.h b/src/adapter.h
index 572a0affa..6e23bb93a 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -71,6 +71,8 @@ struct smp_ltk_info {
 	uint8_t val[16];
 };
 
+void adapter_cleanup(void);
+
 void btd_adapter_start(struct btd_adapter *adapter);
 
 int btd_adapter_stop(struct btd_adapter *adapter);
diff --git a/src/main.c b/src/main.c
index e13d144e4..cb989f979 100644
--- a/src/main.c
+++ b/src/main.c
@@ -578,7 +578,7 @@ int main(int argc, char *argv[])
 	btd_profile_cleanup();
 	btd_agent_cleanup();
 
-	manager_cleanup("/");
+	adapter_cleanup();
 
 	rfkill_exit();
 
diff --git a/src/manager.c b/src/manager.c
index 6e0ff126b..9d115c13f 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -82,7 +82,7 @@ static void manager_remove_adapter(struct btd_adapter *adapter)
 	btd_adapter_unref(adapter);
 }
 
-void manager_cleanup(const char *path)
+void manager_cleanup(void)
 {
 	while (adapters) {
 		struct btd_adapter *adapter = adapters->data;
diff --git a/src/manager.h b/src/manager.h
index 3591be530..a28a641fb 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -27,7 +27,7 @@
 
 typedef void (*adapter_cb) (struct btd_adapter *adapter, gpointer user_data);
 
-void manager_cleanup(const char *path);
+void manager_cleanup(void);
 
 struct btd_adapter *manager_find_adapter(const bdaddr_t *sba);
 struct btd_adapter *manager_find_adapter_by_id(int id);
-- 
2.47.3