summaryrefslogtreecommitdiff
path: root/net/bluetooth/hci_conn.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2014-06-27 13:45:08 +0200
committerMarcel Holtmann <marcel@holtmann.org>2014-07-03 17:42:48 +0200
commita2b1976b8e0184635a1119f8511fc3e68902e429 (patch)
treeb3b519a06233a9a68d1cf69c1b3101bda96e2121 /net/bluetooth/hci_conn.c
parentb10e8017bd9d02a3c7975c06d8fa2fc39df1731c (diff)
downloadlwn-a2b1976b8e0184635a1119f8511fc3e68902e429.tar.gz
lwn-a2b1976b8e0184635a1119f8511fc3e68902e429.zip
Bluetooth: Remove reason parameter from hci_amp_disconn function
The hci_amp_disconn function is a local function and there is no need for a reason parameter. That one can be retrieved from the hci_conn object easily. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/hci_conn.c')
-rw-r--r--net/bluetooth/hci_conn.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 626160c37103..cc64fbe952fa 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -136,7 +136,7 @@ void hci_disconnect(struct hci_conn *conn, __u8 reason)
hci_send_cmd(conn->hdev, HCI_OP_DISCONNECT, sizeof(cp), &cp);
}
-static void hci_amp_disconn(struct hci_conn *conn, __u8 reason)
+static void hci_amp_disconn(struct hci_conn *conn)
{
struct hci_cp_disconn_phy_link cp;
@@ -145,7 +145,7 @@ static void hci_amp_disconn(struct hci_conn *conn, __u8 reason)
conn->state = BT_DISCONN;
cp.phy_handle = HCI_PHY_HANDLE(conn->handle);
- cp.reason = reason;
+ cp.reason = hci_proto_disconn_ind(conn);
hci_send_cmd(conn->hdev, HCI_OP_DISCONN_PHY_LINK,
sizeof(cp), &cp);
}
@@ -273,13 +273,14 @@ void hci_sco_setup(struct hci_conn *conn, __u8 status)
static void hci_conn_disconnect(struct hci_conn *conn)
{
- __u8 reason = hci_proto_disconn_ind(conn);
+ __u8 reason;
switch (conn->type) {
case AMP_LINK:
- hci_amp_disconn(conn, reason);
+ hci_amp_disconn(conn);
break;
default:
+ reason = hci_proto_disconn_ind(conn);
hci_disconnect(conn, reason);
break;
}