Diff between c1c0390313d33b20ba4e9ceba508c07e024a7a7d and 9169c9335d815e920619fd4e18c67893295fb3cf

Changed Files

File Additions Deletions Status
src/adapter.c +1 -9 modified
src/adapter.h +0 -1 modified

Full Patch

diff --git a/src/adapter.c b/src/adapter.c
index 324c899..85c8052 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -3052,7 +3052,7 @@ void adapter_set_discovering(struct btd_adapter *adapter,
 		adapter->scanning_session = NULL;
 	}
 
-	if (adapter_has_discov_sessions(adapter)) {
+	if (adapter->disc_sessions != NULL) {
 		adapter->discov_id = g_idle_add(discovery_cb, adapter);
 
 		DBG("hci%u restarting discovery: disc_sessions %u",
@@ -3306,14 +3306,6 @@ void adapter_remove_connection(struct btd_adapter *adapter,
 	}
 }
 
-gboolean adapter_has_discov_sessions(struct btd_adapter *adapter)
-{
-	if (!adapter || !adapter->disc_sessions)
-		return FALSE;
-
-	return TRUE;
-}
-
 int btd_register_adapter_driver(struct btd_adapter_driver *driver)
 {
 	adapter_drivers = g_slist_append(adapter_drivers, driver);
diff --git a/src/adapter.h b/src/adapter.h
index b0131f4..a63d570 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -129,7 +129,6 @@ void adapter_add_connection(struct btd_adapter *adapter,
 						struct btd_device *device);
 void adapter_remove_connection(struct btd_adapter *adapter,
 						struct btd_device *device);
-gboolean adapter_has_discov_sessions(struct btd_adapter *adapter);
 
 struct btd_adapter *btd_adapter_ref(struct btd_adapter *adapter);
 void btd_adapter_unref(struct btd_adapter *adapter);