diff options
author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2012-08-31 09:39:28 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-09-08 15:53:48 -0400 |
commit | 6b536b5e5e1da32f3ba1e3f42c7bf2f80d37dc6b (patch) | |
tree | 3ee798ccf9f41e54a8fd35c30fc63d8388f80f1d | |
parent | 7923296f3f9eebbe3d7bb4c99d73bd7a226e0146 (diff) |
Bluetooth: Remove unneeded zero init
hdev is allocated with kzalloc so zero initialization is not needed.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
-rw-r--r-- | include/net/bluetooth/hci_core.h | 9 | ||||
-rw-r--r-- | net/bluetooth/hci_core.c | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 1bbc1091748c..fa807a3fd23b 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
@@ -428,15 +428,6 @@ static inline bool hci_conn_ssp_enabled(struct hci_conn *conn) | |||
428 | test_bit(HCI_CONN_SSP_ENABLED, &conn->flags); | 428 | test_bit(HCI_CONN_SSP_ENABLED, &conn->flags); |
429 | } | 429 | } |
430 | 430 | ||
431 | static inline void hci_conn_hash_init(struct hci_dev *hdev) | ||
432 | { | ||
433 | struct hci_conn_hash *h = &hdev->conn_hash; | ||
434 | INIT_LIST_HEAD(&h->list); | ||
435 | h->acl_num = 0; | ||
436 | h->sco_num = 0; | ||
437 | h->le_num = 0; | ||
438 | } | ||
439 | |||
440 | static inline void hci_conn_hash_add(struct hci_dev *hdev, struct hci_conn *c) | 431 | static inline void hci_conn_hash_add(struct hci_dev *hdev, struct hci_conn *c) |
441 | { | 432 | { |
442 | struct hci_conn_hash *h = &hdev->conn_hash; | 433 | struct hci_conn_hash *h = &hdev->conn_hash; |
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index fa974a19d365..86abe721f484 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -1652,6 +1652,7 @@ struct hci_dev *hci_alloc_dev(void) | |||
1652 | INIT_LIST_HEAD(&hdev->link_keys); | 1652 | INIT_LIST_HEAD(&hdev->link_keys); |
1653 | INIT_LIST_HEAD(&hdev->long_term_keys); | 1653 | INIT_LIST_HEAD(&hdev->long_term_keys); |
1654 | INIT_LIST_HEAD(&hdev->remote_oob_data); | 1654 | INIT_LIST_HEAD(&hdev->remote_oob_data); |
1655 | INIT_LIST_HEAD(&hdev->conn_hash.list); | ||
1655 | 1656 | ||
1656 | INIT_WORK(&hdev->rx_work, hci_rx_work); | 1657 | INIT_WORK(&hdev->rx_work, hci_rx_work); |
1657 | INIT_WORK(&hdev->cmd_work, hci_cmd_work); | 1658 | INIT_WORK(&hdev->cmd_work, hci_cmd_work); |
@@ -1674,7 +1675,6 @@ struct hci_dev *hci_alloc_dev(void) | |||
1674 | 1675 | ||
1675 | hci_init_sysfs(hdev); | 1676 | hci_init_sysfs(hdev); |
1676 | discovery_init(hdev); | 1677 | discovery_init(hdev); |
1677 | hci_conn_hash_init(hdev); | ||
1678 | 1678 | ||
1679 | return hdev; | 1679 | return hdev; |
1680 | } | 1680 | } |