mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 13:55:32 +00:00
Code Issues Releases Wiki Activity

Bluetooth: Remove unnecessary return value from check_pending_le_conn

Browse source 
Since the only caller of this function doesn't care about the return
value anymore let's just remove it.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Johan Hedberg 2014-07-07 12:45:55 +03:00 committed by Marcel Holtmann
parent 841c564499
commit 7e899c9493
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
net/bluetooth/hci_event.c
View file

@ -4228,18 +4228,18 @@ static void hci_le_conn_update_complete_evt(struct hci_dev *hdev,
}
/* This function requires the caller holds hdev->lock */
static bool check_pending_le_conn(struct hci_dev *hdev, bdaddr_t *addr,
static void check_pending_le_conn(struct hci_dev *hdev, bdaddr_t *addr,
u8 addr_type, u8 adv_type)
{
struct hci_conn *conn;
/* If the event is not connectable don't proceed further */
if (adv_type != LE_ADV_IND && adv_type != LE_ADV_DIRECT_IND)
return false;
return;
/* Ignore if the device is blocked */
if (hci_blacklist_lookup(hdev, addr, addr_type))
return false;
return;
/* If we're connectable, always connect any ADV_DIRECT_IND event */
if (test_bit(HCI_CONNECTABLE, &hdev->dev_flags) &&
@ -4250,13 +4250,13 @@ static bool check_pending_le_conn(struct hci_dev *hdev, bdaddr_t *addr,
* our pend_le_conns list.
*/
if (!hci_pend_le_action_lookup(&hdev->pend_le_conns, addr, addr_type))
return false;
return;
connect:
conn = hci_connect_le(hdev, addr, addr_type, BT_SECURITY_LOW,
HCI_AT_NO_BONDING, HCI_LE_AUTOCONN_TIMEOUT);
if (!IS_ERR(conn))
return true;
return;
switch (PTR_ERR(conn)) {
case -EBUSY:
@ -4269,8 +4269,6 @@ static bool check_pending_le_conn(struct hci_dev *hdev, bdaddr_t *addr,
default:
BT_DBG("Failed to connect: err %ld", PTR_ERR(conn));
}
return true;
}
static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,