From 0691f7f30e190eb40063df3f5feadd923f7395a8 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Fri, 12 Jul 2013 12:28:57 +0300 Subject: [PATCH] core: Remove unnecessary device_resolve_svc function --- src/device.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/device.c b/src/device.c index 13deebde9..18d0d460f 100644 --- a/src/device.c +++ b/src/device.c @@ -1224,14 +1224,6 @@ void device_add_eir_uuids(struct btd_device *dev, GSList *uuids) DEVICE_INTERFACE, "UUIDs"); } -static int device_resolve_svc(struct btd_device *dev, DBusMessage *msg) -{ - if (device_is_bredr(dev)) - return device_browse_sdp(dev, msg); - else - return device_browse_primary(dev, msg); -} - static struct btd_service *find_connectable_service(struct btd_device *dev, const char *uuid) { @@ -1332,7 +1324,12 @@ static DBusMessage *connect_profiles(struct btd_device *dev, DBusMessage *msg, return NULL; resolve_services: - err = device_resolve_svc(dev, msg); + DBG("Resolving services for %s", dev->path); + + if (device_is_bredr(dev)) + err = device_browse_sdp(dev, msg); + else + err = device_browse_primary(dev, msg); if (err < 0) return btd_error_failed(msg, strerror(-err)); -- 2.47.3