From 9169c9335d815e920619fd4e18c67893295fb3cf Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Mon, 10 Dec 2012 13:36:17 +0200 Subject: [PATCH] core: Remove useless adapter_has_discov_sessions function --- src/adapter.c | 10 +--------- src/adapter.h | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index 324c8993a..85c8052b9 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 b0131f467..a63d570fa 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); -- 2.47.3