Bluetooth: Move device initialization to hci_alloc_dev()

We currently initialize locks, lists, works, etc. in hci_register_dev()
(hci_alloc_dev() was added later) which is bogus because an hdev is in an
invalid state if it is not registered.
This patch moves all memory initialization to hci_alloc_dev(). Device
registering and registration of sub-modules is still left in
hci_register_dev() as it belongs there.

The benefit is (despite cleaning up the code-base) we can now always be
sure that an hdev is a valid object and can be locked and worked on even
though it may not be registered.

This patch also reorders the initialization to be easier to understand.
First the memory is initialized, then all generic structures and as last
step the sub-init functions are called. This guarantees that all
dependencies are initialized in the right order and makes it also easier
to find a specific line. We previously initialized it in the same order as
the "struct hci_dev" is declared which seems pretty random.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

1 files changed, 52 insertions, 63 deletions

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index d3fb986d6b27..a362f01bf081 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1713,13 +1713,63 @@ int hci_le_scan(struct hci_dev *hdev, u8 type, u16 interval, u16 window,
 struct hci_dev *hci_alloc_dev(void)
 {
         struct hci_dev *hdev;
+        int i;
 
         hdev = kzalloc(sizeof(struct hci_dev), GFP_KERNEL);
         if (!hdev)
                 return NULL;
 
-        hci_init_sysfs(hdev);
+        hdev->flags = 0;
+        hdev->dev_flags = 0;
+        hdev->pkt_type  = (HCI_DM1 | HCI_DH1 | HCI_HV1);
+        hdev->esco_type = (ESCO_HV1);
+        hdev->link_mode = (HCI_LM_ACCEPT);
+        hdev->io_capability = 0x03; /* No Input No Output */
+
+        hdev->idle_timeout = 0;
+        hdev->sniff_max_interval = 800;
+        hdev->sniff_min_interval = 80;
+
+        mutex_init(&hdev->lock);
+        mutex_init(&hdev->req_lock);
+
+        INIT_LIST_HEAD(&hdev->mgmt_pending);
+        INIT_LIST_HEAD(&hdev->blacklist);
+        INIT_LIST_HEAD(&hdev->uuids);
+        INIT_LIST_HEAD(&hdev->link_keys);
+        INIT_LIST_HEAD(&hdev->long_term_keys);
+        INIT_LIST_HEAD(&hdev->remote_oob_data);
+        INIT_LIST_HEAD(&hdev->adv_entries);
+
+        INIT_WORK(&hdev->rx_work, hci_rx_work);
+        INIT_WORK(&hdev->cmd_work, hci_cmd_work);
+        INIT_WORK(&hdev->tx_work, hci_tx_work);
+        INIT_WORK(&hdev->power_on, hci_power_on);
+        INIT_WORK(&hdev->le_scan, le_scan_work);
+
+        INIT_DELAYED_WORK(&hdev->adv_work, hci_clear_adv_cache);
+        INIT_DELAYED_WORK(&hdev->power_off, hci_power_off);
+        INIT_DELAYED_WORK(&hdev->discov_off, hci_discov_off);
+        INIT_DELAYED_WORK(&hdev->le_scan_disable, le_scan_disable_work);
+
         skb_queue_head_init(&hdev->driver_init);
+        skb_queue_head_init(&hdev->rx_q);
+        skb_queue_head_init(&hdev->cmd_q);
+        skb_queue_head_init(&hdev->raw_q);
+
+        init_waitqueue_head(&hdev->req_wait_q);
+
+        setup_timer(&hdev->cmd_timer, hci_cmd_timer, (unsigned long) hdev);
+
+        memset(&hdev->stat, 0, sizeof(struct hci_dev_stats));
+        atomic_set(&hdev->promisc, 0);
+
+        for (i = 0; i < NUM_REASSEMBLY; i++)
+                hdev->reassembly[i] = NULL;
+
+        hci_init_sysfs(hdev);
+        discovery_init(hdev);
+        hci_conn_hash_init(hdev);
 
         return hdev;
 }
@@ -1739,7 +1789,7 @@ EXPORT_SYMBOL(hci_free_dev);
 int hci_register_dev(struct hci_dev *hdev)
 {
         struct list_head *head, *p;
-        int i, id, error;
+        int id, error;
 
         if (!hdev->open || !hdev->close)
                 return -EINVAL;
@@ -1769,67 +1819,6 @@ int hci_register_dev(struct hci_dev *hdev)
 
         list_add(&hdev->list, head);
 
-        mutex_init(&hdev->lock);
-
-        hdev->flags = 0;
-        hdev->dev_flags = 0;
-        hdev->pkt_type  = (HCI_DM1 | HCI_DH1 | HCI_HV1);
-        hdev->esco_type = (ESCO_HV1);
-        hdev->link_mode = (HCI_LM_ACCEPT);
-        hdev->io_capability = 0x03; /* No Input No Output */
-
-        hdev->idle_timeout = 0;
-        hdev->sniff_max_interval = 800;
-        hdev->sniff_min_interval = 80;
-
-        INIT_WORK(&hdev->rx_work, hci_rx_work);
-        INIT_WORK(&hdev->cmd_work, hci_cmd_work);
-        INIT_WORK(&hdev->tx_work, hci_tx_work);
-
-
-        skb_queue_head_init(&hdev->rx_q);
-        skb_queue_head_init(&hdev->cmd_q);
-        skb_queue_head_init(&hdev->raw_q);
-
-        setup_timer(&hdev->cmd_timer, hci_cmd_timer, (unsigned long) hdev);
-
-        for (i = 0; i < NUM_REASSEMBLY; i++)
-                hdev->reassembly[i] = NULL;
-
-        init_waitqueue_head(&hdev->req_wait_q);
-        mutex_init(&hdev->req_lock);
-
-        discovery_init(hdev);
-
-        hci_conn_hash_init(hdev);
-
-        INIT_LIST_HEAD(&hdev->mgmt_pending);
-
-        INIT_LIST_HEAD(&hdev->blacklist);
-
-        INIT_LIST_HEAD(&hdev->uuids);
-
-        INIT_LIST_HEAD(&hdev->link_keys);
-        INIT_LIST_HEAD(&hdev->long_term_keys);
-
-        INIT_LIST_HEAD(&hdev->remote_oob_data);
-
-        INIT_LIST_HEAD(&hdev->adv_entries);
-
-        INIT_DELAYED_WORK(&hdev->adv_work, hci_clear_adv_cache);
-        INIT_WORK(&hdev->power_on, hci_power_on);
-        INIT_DELAYED_WORK(&hdev->power_off, hci_power_off);
-
-        INIT_DELAYED_WORK(&hdev->discov_off, hci_discov_off);
-
-        memset(&hdev->stat, 0, sizeof(struct hci_dev_stats));
-
-        atomic_set(&hdev->promisc, 0);
-
-        INIT_WORK(&hdev->le_scan, le_scan_work);
-
-        INIT_DELAYED_WORK(&hdev->le_scan_disable, le_scan_disable_work);
-
         write_unlock(&hci_dev_list_lock);
 
         hdev->workqueue = alloc_workqueue(hdev->name, WQ_HIGHPRI | WQ_UNBOUND |