Commit 9e664631 authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Gustavo Padovan
Browse files

Bluetooth: Make connect / disconnect cfm functions return void 



Return values are never used because callers hci_proto_connect_cfm
and hci_proto_disconn_cfm return void.

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent c58e810e

include/net/bluetooth/hci_core.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -350,16 +350,16 @@ extern rwlock_t hci_cb_list_lock; 




/* ----- HCI interface to upper protocols ----- */

/* ----- HCI interface to upper protocols ----- */

extern int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr);

extern int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr);

extern int l2cap_connect_cfm(struct hci_conn *hcon, u8 status);

extern void l2cap_connect_cfm(struct hci_conn *hcon, u8 status);

extern int l2cap_disconn_ind(struct hci_conn *hcon);

extern int l2cap_disconn_ind(struct hci_conn *hcon);

extern int l2cap_disconn_cfm(struct hci_conn *hcon, u8 reason);

extern void l2cap_disconn_cfm(struct hci_conn *hcon, u8 reason);

extern int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt);

extern int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt);

extern int l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb,

extern int l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb,

			      u16 flags);

			      u16 flags);





extern int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr);

extern int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr);

extern int sco_connect_cfm(struct hci_conn *hcon, __u8 status);

extern void sco_connect_cfm(struct hci_conn *hcon, __u8 status);

extern int sco_disconn_cfm(struct hci_conn *hcon, __u8 reason);

extern void sco_disconn_cfm(struct hci_conn *hcon, __u8 reason);

extern int sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb);

extern int sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb);





/* ----- Inquiry cache ----- */

/* ----- Inquiry cache ----- */

net/bluetooth/l2cap_core.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -5329,7 +5329,7 @@ int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr) 
	return exact ? lm1 : lm2;

	return exact ? lm1 : lm2;

}

}





int l2cap_connect_cfm(struct hci_conn *hcon, u8 status)

void l2cap_connect_cfm(struct hci_conn *hcon, u8 status)

{

{

	struct l2cap_conn *conn;

	struct l2cap_conn *conn;
@@ -5342,7 +5342,6 @@ int l2cap_connect_cfm(struct hci_conn *hcon, u8 status) 
	} else

	} else

		l2cap_conn_del(hcon, bt_to_errno(status));

		l2cap_conn_del(hcon, bt_to_errno(status));





	return 0;

}

}





int l2cap_disconn_ind(struct hci_conn *hcon)

int l2cap_disconn_ind(struct hci_conn *hcon)
@@ -5356,12 +5355,11 @@ int l2cap_disconn_ind(struct hci_conn *hcon) 
	return conn->disc_reason;

	return conn->disc_reason;

}

}





int l2cap_disconn_cfm(struct hci_conn *hcon, u8 reason)

void l2cap_disconn_cfm(struct hci_conn *hcon, u8 reason)

{

{

	BT_DBG("hcon %p reason %d", hcon, reason);

	BT_DBG("hcon %p reason %d", hcon, reason);





	l2cap_conn_del(hcon, bt_to_errno(reason));

	l2cap_conn_del(hcon, bt_to_errno(reason));

	return 0;

}

}





static inline void l2cap_check_encryption(struct l2cap_chan *chan, u8 encrypt)

static inline void l2cap_check_encryption(struct l2cap_chan *chan, u8 encrypt)

net/bluetooth/sco.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -913,7 +913,7 @@ int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr) 
	return lm;

	return lm;

}

}





int sco_connect_cfm(struct hci_conn *hcon, __u8 status)

void sco_connect_cfm(struct hci_conn *hcon, __u8 status)

{

{

	BT_DBG("hcon %p bdaddr %s status %d", hcon, batostr(&hcon->dst), status);

	BT_DBG("hcon %p bdaddr %s status %d", hcon, batostr(&hcon->dst), status);

	if (!status) {

	if (!status) {
@@ -924,16 +924,13 @@ int sco_connect_cfm(struct hci_conn *hcon, __u8 status) 
			sco_conn_ready(conn);

			sco_conn_ready(conn);

	} else

	} else

		sco_conn_del(hcon, bt_to_errno(status));

		sco_conn_del(hcon, bt_to_errno(status));



	return 0;

}

}





int sco_disconn_cfm(struct hci_conn *hcon, __u8 reason)

void sco_disconn_cfm(struct hci_conn *hcon, __u8 reason)

{

{

	BT_DBG("hcon %p reason %d", hcon, reason);

	BT_DBG("hcon %p reason %d", hcon, reason);





	sco_conn_del(hcon, bt_to_errno(reason));

	sco_conn_del(hcon, bt_to_errno(reason));

	return 0;

}

}





int sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb)

int sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb)