Move error_connection_attempt_failed to its usage places

4 files changed, 16 insertions, 17 deletions

diff --git a/audio/headset.c b/audio/headset.c
index 1ffa7456..bcbc9e8a 100644
--- a/audio/headset.c
+++ b/audio/headset.c
@@ -152,6 +152,14 @@ static DBusHandlerResult error_not_supported(DBusConnection *conn,
 							"Not supported");
 }
 
+static DBusHandlerResult error_connection_attempt_failed(DBusConnection *conn,
+						DBusMessage *msg, int err)
+{
+	return error_common_reply(conn, msg,
+			ERROR_INTERFACE ".ConnectionAttemptFailed",
+			err > 0 ? strerror(err) : "Connection attempt failed");
+}
+
 static int rfcomm_connect(struct audio_device *device, headset_stream_cb_t cb,
 				void *user_data, unsigned int *cb_id);
 static int get_records(struct audio_device *device, headset_stream_cb_t cb,
diff --git a/common/error.c b/common/error.c
index d6f321bd..825cde4f 100644
--- a/common/error.c
+++ b/common/error.c
@@ -35,19 +35,6 @@
 
 #include "error.h"
 
-/**
-  org.bluez.Error.ConnectionAttemptFailed:
-
-  An unexpected error (other than DeviceUnreachable) error has occured while
-  attempting a connection to a device
-*/
-DBusHandlerResult error_connection_attempt_failed(DBusConnection *conn, DBusMessage *msg, int err)
-{
-	return error_common_reply(conn, msg,
-			ERROR_INTERFACE ".ConnectionAttemptFailed",
-			err > 0 ? strerror(err) : "Connection attempt failed");
-}
-
 /* Helper function - internal use only */
 DBusHandlerResult error_common_reply(DBusConnection *conn, DBusMessage *msg,
 					const char *name, const char *descr)
diff --git a/common/error.h b/common/error.h
index 63ce2069..644e385f 100644
--- a/common/error.h
+++ b/common/error.h
@@ -27,9 +27,5 @@
 
 #define ERROR_INTERFACE "org.bluez.Error"
 
-DBusHandlerResult error_connection_attempt_failed(DBusConnection *conn,
-							DBusMessage *msg,
-							int err);
-
 DBusHandlerResult error_common_reply(DBusConnection *conn, DBusMessage *msg,
 					const char *name, const char *descr);
diff --git a/src/adapter.c b/src/adapter.c
index 0adfffd9..a31b47f2 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -154,6 +154,14 @@ static DBusHandlerResult error_failed_errno(DBusConnection *conn,
 	return error_failed(conn, msg, desc);
 }
 
+static DBusHandlerResult error_connection_attempt_failed(DBusConnection *conn,
+						DBusMessage *msg, int err)
+{
+	return error_common_reply(conn, msg,
+			ERROR_INTERFACE ".ConnectionAttemptFailed",
+			err > 0 ? strerror(err) : "Connection attempt failed");
+}
+
 static int auth_req_cmp(const void *p1, const void *p2)
 {
 	const struct pending_auth_info *pb1 = p1;