aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>2012-09-06 08:05:43 -0400
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-09-08 16:27:18 -0400
commit9472007c62ecc8f21daa2e1e252bf73b67e535fc (patch)
tree6e6cd3ff8ba4f9bf4e591a8acc27e13a8ef6031b
parent6b536b5e5e1da32f3ba1e3f42c7bf2f80d37dc6b (diff)
Bluetooth: trivial: Make hci_chan_del return void
Return code is not needed in hci_chan_del Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
-rw-r--r--include/net/bluetooth/hci_core.h2
-rw-r--r--net/bluetooth/hci_conn.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index fa807a3fd23b..4704ca4b8767 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -552,7 +552,7 @@ void hci_conn_hash_flush(struct hci_dev *hdev);
552void hci_conn_check_pending(struct hci_dev *hdev); 552void hci_conn_check_pending(struct hci_dev *hdev);
553 553
554struct hci_chan *hci_chan_create(struct hci_conn *conn); 554struct hci_chan *hci_chan_create(struct hci_conn *conn);
555int hci_chan_del(struct hci_chan *chan); 555void hci_chan_del(struct hci_chan *chan);
556void hci_chan_list_flush(struct hci_conn *conn); 556void hci_chan_list_flush(struct hci_conn *conn);
557 557
558struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, 558struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst,
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 3e65c021df50..59f0344406c8 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -935,7 +935,7 @@ struct hci_chan *hci_chan_create(struct hci_conn *conn)
935 return chan; 935 return chan;
936} 936}
937 937
938int hci_chan_del(struct hci_chan *chan) 938void hci_chan_del(struct hci_chan *chan)
939{ 939{
940 struct hci_conn *conn = chan->conn; 940 struct hci_conn *conn = chan->conn;
941 struct hci_dev *hdev = conn->hdev; 941 struct hci_dev *hdev = conn->hdev;
@@ -948,8 +948,6 @@ int hci_chan_del(struct hci_chan *chan)
948 948
949 skb_queue_purge(&chan->data_q); 949 skb_queue_purge(&chan->data_q);
950 kfree(chan); 950 kfree(chan);
951
952 return 0;
953} 951}
954 952
955void hci_chan_list_flush(struct hci_conn *conn) 953void hci_chan_list_flush(struct hci_conn *conn)