Bluetooth: Make mgmt_device_disconnected() return void
The return value of mgmt_device_disconnected() function is not used and so just change it to return void. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Родитель
ecd90ae7f6
Коммит
9b80ec5e8e
|
@ -1104,8 +1104,8 @@ int mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,
|
||||||
void mgmt_device_connected(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
|
void mgmt_device_connected(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
|
||||||
u8 addr_type, u32 flags, u8 *name, u8 name_len,
|
u8 addr_type, u32 flags, u8 *name, u8 name_len,
|
||||||
u8 *dev_class);
|
u8 *dev_class);
|
||||||
int mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr,
|
void mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr,
|
||||||
u8 link_type, u8 addr_type, u8 reason);
|
u8 link_type, u8 addr_type, u8 reason);
|
||||||
void mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr,
|
void mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr,
|
||||||
u8 link_type, u8 addr_type, u8 status);
|
u8 link_type, u8 addr_type, u8 status);
|
||||||
void mgmt_connect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
|
void mgmt_connect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
|
||||||
|
|
|
@ -4118,12 +4118,11 @@ static void unpair_device_rsp(struct pending_cmd *cmd, void *data)
|
||||||
mgmt_pending_remove(cmd);
|
mgmt_pending_remove(cmd);
|
||||||
}
|
}
|
||||||
|
|
||||||
int mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr,
|
void mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr,
|
||||||
u8 link_type, u8 addr_type, u8 reason)
|
u8 link_type, u8 addr_type, u8 reason)
|
||||||
{
|
{
|
||||||
struct mgmt_ev_device_disconnected ev;
|
struct mgmt_ev_device_disconnected ev;
|
||||||
struct sock *sk = NULL;
|
struct sock *sk = NULL;
|
||||||
int err;
|
|
||||||
|
|
||||||
mgmt_pending_foreach(MGMT_OP_DISCONNECT, hdev, disconnect_rsp, &sk);
|
mgmt_pending_foreach(MGMT_OP_DISCONNECT, hdev, disconnect_rsp, &sk);
|
||||||
|
|
||||||
|
@ -4131,16 +4130,13 @@ int mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr,
|
||||||
ev.addr.type = link_to_bdaddr(link_type, addr_type);
|
ev.addr.type = link_to_bdaddr(link_type, addr_type);
|
||||||
ev.reason = reason;
|
ev.reason = reason;
|
||||||
|
|
||||||
err = mgmt_event(MGMT_EV_DEVICE_DISCONNECTED, hdev, &ev, sizeof(ev),
|
mgmt_event(MGMT_EV_DEVICE_DISCONNECTED, hdev, &ev, sizeof(ev), sk);
|
||||||
sk);
|
|
||||||
|
|
||||||
if (sk)
|
if (sk)
|
||||||
sock_put(sk);
|
sock_put(sk);
|
||||||
|
|
||||||
mgmt_pending_foreach(MGMT_OP_UNPAIR_DEVICE, hdev, unpair_device_rsp,
|
mgmt_pending_foreach(MGMT_OP_UNPAIR_DEVICE, hdev, unpair_device_rsp,
|
||||||
hdev);
|
hdev);
|
||||||
|
|
||||||
return err;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr,
|
void mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче