Bluetooth: Separate btmrvl_register_hdev() from btmrvl_add_card()
[linux-3.10.git] / drivers / bluetooth / btmrvl_main.c
index bbc4446..ec48bfe 100644 (file)
@@ -32,8 +32,6 @@
  */
 void btmrvl_interrupt(struct btmrvl_private *priv)
 {
-       BT_DBG("Enter");
-
        priv->adapter->ps_state = PS_AWAKE;
 
        priv->adapter->wakeup_tries = 0;
@@ -41,8 +39,6 @@ void btmrvl_interrupt(struct btmrvl_private *priv)
        priv->adapter->int_count++;
 
        wake_up_interruptible(&priv->main_thread.wait_q);
-
-       BT_DBG("Leave");
 }
 EXPORT_SYMBOL_GPL(btmrvl_interrupt);
 
@@ -52,8 +48,6 @@ void btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb)
        struct hci_ev_cmd_complete *ec;
        u16 opcode, ocf;
 
-       BT_DBG("Enter");
-
        if (hdr->evt == HCI_EV_CMD_COMPLETE) {
                ec = (void *) (skb->data + HCI_EVENT_HDR_SIZE);
                opcode = __le16_to_cpu(ec->opcode);
@@ -65,8 +59,6 @@ void btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb)
                        wake_up_interruptible(&priv->adapter->cmd_wait_q);
                }
        }
-
-       BT_DBG("Leave");
 }
 EXPORT_SYMBOL_GPL(btmrvl_check_evtpkt);
 
@@ -74,9 +66,7 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)
 {
        struct btmrvl_adapter *adapter = priv->adapter;
        struct btmrvl_event *event;
-       u8 ret = 0;
-
-       BT_DBG("Enter");
+       int ret = 0;
 
        event = (struct btmrvl_event *) skb->data;
        if (event->ec != 0xff) {
@@ -122,8 +112,10 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)
        case BT_CMD_MODULE_CFG_REQ:
                if (priv->btmrvl_dev.sendcmdflag &&
                                event->data[1] == MODULE_BRINGUP_REQ) {
-                       BT_DBG("EVENT:%s", (event->data[2]) ?
-                               "Bring-up failed" : "Bring-up succeed");
+                       BT_DBG("EVENT:%s",
+                               ((event->data[2] == MODULE_BROUGHT_UP) ||
+                               (event->data[2] == MODULE_ALREADY_UP)) ?
+                               "Bring-up succeed" : "Bring-up failed");
                } else if (priv->btmrvl_dev.sendcmdflag &&
                                event->data[1] == MODULE_SHUTDOWN_REQ) {
                        BT_DBG("EVENT:%s", (event->data[2]) ?
@@ -151,8 +143,6 @@ exit:
        if (!ret)
                kfree_skb(skb);
 
-       BT_DBG("Leave");
-
        return ret;
 }
 EXPORT_SYMBOL_GPL(btmrvl_process_event);
@@ -161,15 +151,12 @@ int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd)
 {
        struct sk_buff *skb;
        struct btmrvl_cmd *cmd;
-       u8 ret = 0;
-
-       BT_DBG("Enter");
+       int ret = 0;
 
        skb = bt_skb_alloc(sizeof(*cmd), GFP_ATOMIC);
        if (skb == NULL) {
                BT_ERR("No free skb");
-               ret = -ENOMEM;
-               goto exit;
+               return -ENOMEM;
        }
 
        cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));
@@ -200,26 +187,52 @@ int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd)
 
        BT_DBG("module cfg Command done");
 
-exit:
-       BT_DBG("Leave");
-
        return ret;
 }
 EXPORT_SYMBOL_GPL(btmrvl_send_module_cfg_cmd);
 
-static int btmrvl_enable_hs(struct btmrvl_private *priv)
+int btmrvl_enable_ps(struct btmrvl_private *priv)
 {
        struct sk_buff *skb;
        struct btmrvl_cmd *cmd;
-       u8 ret = 0;
 
-       BT_DBG("Enter");
+       skb = bt_skb_alloc(sizeof(*cmd), GFP_ATOMIC);
+       if (skb == NULL) {
+               BT_ERR("No free skb");
+               return -ENOMEM;
+       }
+
+       cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));
+       cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF,
+                                       BT_CMD_AUTO_SLEEP_MODE));
+       cmd->length = 1;
+
+       if (priv->btmrvl_dev.psmode)
+               cmd->data[0] = BT_PS_ENABLE;
+       else
+               cmd->data[0] = BT_PS_DISABLE;
+
+       bt_cb(skb)->pkt_type = MRVL_VENDOR_PKT;
+
+       skb->dev = (void *) priv->btmrvl_dev.hcidev;
+       skb_queue_head(&priv->adapter->tx_queue, skb);
+
+       BT_DBG("Queue PSMODE Command:%d", cmd->data[0]);
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(btmrvl_enable_ps);
+
+static int btmrvl_enable_hs(struct btmrvl_private *priv)
+{
+       struct sk_buff *skb;
+       struct btmrvl_cmd *cmd;
+       int ret = 0;
 
        skb = bt_skb_alloc(sizeof(*cmd), GFP_ATOMIC);
        if (skb == NULL) {
                BT_ERR("No free skb");
-               ret = -ENOMEM;
-               goto exit;
+               return -ENOMEM;
        }
 
        cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));
@@ -244,9 +257,6 @@ static int btmrvl_enable_hs(struct btmrvl_private *priv)
                                                priv->adapter->wakeup_tries);
        }
 
-exit:
-       BT_DBG("Leave");
-
        return ret;
 }
 
@@ -254,9 +264,7 @@ int btmrvl_prepare_command(struct btmrvl_private *priv)
 {
        struct sk_buff *skb = NULL;
        struct btmrvl_cmd *cmd;
-       u8 ret = 0;
-
-       BT_DBG("Enter");
+       int ret = 0;
 
        if (priv->btmrvl_dev.hscfgcmd) {
                priv->btmrvl_dev.hscfgcmd = 0;
@@ -264,8 +272,7 @@ int btmrvl_prepare_command(struct btmrvl_private *priv)
                skb = bt_skb_alloc(sizeof(*cmd), GFP_ATOMIC);
                if (skb == NULL) {
                        BT_ERR("No free skb");
-                       ret = -ENOMEM;
-                       goto exit;
+                       return -ENOMEM;
                }
 
                cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));
@@ -285,29 +292,7 @@ int btmrvl_prepare_command(struct btmrvl_private *priv)
 
        if (priv->btmrvl_dev.pscmd) {
                priv->btmrvl_dev.pscmd = 0;
-
-               skb = bt_skb_alloc(sizeof(*cmd), GFP_ATOMIC);
-               if (skb == NULL) {
-                       BT_ERR("No free skb");
-                       ret = -ENOMEM;
-                       goto exit;
-               }
-
-               cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));
-               cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_AUTO_SLEEP_MODE));
-               cmd->length = 1;
-
-               if (priv->btmrvl_dev.psmode)
-                       cmd->data[0] = BT_PS_ENABLE;
-               else
-                       cmd->data[0] = BT_PS_DISABLE;
-
-               bt_cb(skb)->pkt_type = MRVL_VENDOR_PKT;
-
-               skb->dev = (void *) priv->btmrvl_dev.hcidev;
-               skb_queue_head(&priv->adapter->tx_queue, skb);
-
-               BT_DBG("Queue PSMODE Command:%d", cmd->data[0]);
+               btmrvl_enable_ps(priv);
        }
 
        if (priv->btmrvl_dev.hscmd) {
@@ -321,27 +306,19 @@ int btmrvl_prepare_command(struct btmrvl_private *priv)
                }
        }
 
-exit:
-       BT_DBG("Leave");
-
        return ret;
 }
 
 static int btmrvl_tx_pkt(struct btmrvl_private *priv, struct sk_buff *skb)
 {
-       u8 ret = 0;
+       int ret = 0;
 
-       BT_DBG("Enter");
-
-       if (!skb || !skb->data) {
-               BT_DBG("Leave");
+       if (!skb || !skb->data)
                return -EINVAL;
-       }
 
        if (!skb->len || ((skb->len + BTM_HEADER_LEN) > BTM_UPLD_SIZE)) {
                BT_ERR("Tx Error: Bad skb length %d : %d",
                                                skb->len, BTM_UPLD_SIZE);
-               BT_DBG("Leave");
                return -EINVAL;
        }
 
@@ -353,7 +330,6 @@ static int btmrvl_tx_pkt(struct btmrvl_private *priv, struct sk_buff *skb)
                        BT_ERR("Tx Error: realloc_headroom failed %d",
                                BTM_HEADER_LEN);
                        skb = tmp;
-                       BT_DBG("Leave");
                        return -EINVAL;
                }
 
@@ -375,52 +351,35 @@ static int btmrvl_tx_pkt(struct btmrvl_private *priv, struct sk_buff *skb)
        if (priv->hw_host_to_card)
                ret = priv->hw_host_to_card(priv, skb->data, skb->len);
 
-       BT_DBG("Leave");
-
        return ret;
 }
 
 static void btmrvl_init_adapter(struct btmrvl_private *priv)
 {
-       BT_DBG("Enter");
-
        skb_queue_head_init(&priv->adapter->tx_queue);
 
        priv->adapter->ps_state = PS_AWAKE;
 
        init_waitqueue_head(&priv->adapter->cmd_wait_q);
-
-       BT_DBG("Leave");
 }
 
 static void btmrvl_free_adapter(struct btmrvl_private *priv)
 {
-       BT_DBG("Enter");
-
        skb_queue_purge(&priv->adapter->tx_queue);
 
        kfree(priv->adapter);
 
        priv->adapter = NULL;
-
-       BT_DBG("Leave");
 }
 
 static int btmrvl_ioctl(struct hci_dev *hdev,
                                unsigned int cmd, unsigned long arg)
 {
-       BT_DBG("Enter");
-
-       BT_DBG("Leave");
-
        return -ENOIOCTLCMD;
 }
 
 static void btmrvl_destruct(struct hci_dev *hdev)
 {
-       BT_DBG("Enter");
-
-       BT_DBG("Leave");
 }
 
 static int btmrvl_send_frame(struct sk_buff *skb)
@@ -428,11 +387,10 @@ static int btmrvl_send_frame(struct sk_buff *skb)
        struct hci_dev *hdev = (struct hci_dev *) skb->dev;
        struct btmrvl_private *priv = NULL;
 
-       BT_DBG("Enter: type=%d, len=%d", skb->pkt_type, skb->len);
+       BT_DBG("type=%d, len=%d", skb->pkt_type, skb->len);
 
        if (!hdev || !hdev->driver_data) {
                BT_ERR("Frame for unknown HCI device");
-               BT_DBG("Leave");
                return -ENODEV;
        }
 
@@ -441,7 +399,6 @@ static int btmrvl_send_frame(struct sk_buff *skb)
                BT_ERR("Failed testing HCI_RUNING, flags=%lx", hdev->flags);
                print_hex_dump_bytes("data: ", DUMP_PREFIX_OFFSET,
                                                        skb->data, skb->len);
-               BT_DBG("Leave");
                return -EBUSY;
        }
 
@@ -463,8 +420,6 @@ static int btmrvl_send_frame(struct sk_buff *skb)
 
        wake_up_interruptible(&priv->main_thread.wait_q);
 
-       BT_DBG("Leave");
-
        return 0;
 }
 
@@ -472,12 +427,8 @@ static int btmrvl_flush(struct hci_dev *hdev)
 {
        struct btmrvl_private *priv = hdev->driver_data;
 
-       BT_DBG("Enter");
-
        skb_queue_purge(&priv->adapter->tx_queue);
 
-       BT_DBG("Leave");
-
        return 0;
 }
 
@@ -485,28 +436,18 @@ static int btmrvl_close(struct hci_dev *hdev)
 {
        struct btmrvl_private *priv = hdev->driver_data;
 
-       BT_DBG("Enter");
-
-       if (!test_and_clear_bit(HCI_RUNNING, &hdev->flags)) {
-               BT_DBG("Leave");
+       if (!test_and_clear_bit(HCI_RUNNING, &hdev->flags))
                return 0;
-       }
 
        skb_queue_purge(&priv->adapter->tx_queue);
 
-       BT_DBG("Leave");
-
        return 0;
 }
 
 static int btmrvl_open(struct hci_dev *hdev)
 {
-       BT_DBG("Enter");
-
        set_bit(HCI_RUNNING, &hdev->flags);
 
-       BT_DBG("Leave");
-
        return 0;
 }
 
@@ -523,8 +464,6 @@ static int btmrvl_service_main_thread(void *data)
        struct sk_buff *skb;
        ulong flags;
 
-       BT_DBG("Enter");
-
        init_waitqueue_entry(&wait, current);
 
        current->flags |= PF_NOFREEZE;
@@ -582,55 +521,24 @@ static int btmrvl_service_main_thread(void *data)
                }
        }
 
-       BT_DBG("Leave");
-
        return 0;
 }
 
-struct btmrvl_private *btmrvl_add_card(void *card)
+int btmrvl_register_hdev(struct btmrvl_private *priv)
 {
        struct hci_dev *hdev = NULL;
-       struct btmrvl_private *priv;
        int ret;
 
-       BT_DBG("Enter");
-
-       priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-       if (!priv) {
-               BT_ERR("Can not allocate priv");
-               goto err_priv;
-       }
-
-       priv->adapter = kzalloc(sizeof(*priv->adapter), GFP_KERNEL);
-       if (!priv->adapter) {
-               BT_ERR("Allocate buffer for btmrvl_adapter failed!");
-               goto err_adapter;
-       }
-
-       btmrvl_init_adapter(priv);
-
        hdev = hci_alloc_dev();
        if (!hdev) {
                BT_ERR("Can not allocate HCI device");
                goto err_hdev;
        }
 
-       BT_DBG("Starting kthread...");
-       priv->main_thread.priv = priv;
-       spin_lock_init(&priv->driver_lock);
-
-       init_waitqueue_head(&priv->main_thread.wait_q);
-       priv->main_thread.task = kthread_run(btmrvl_service_main_thread,
-                               &priv->main_thread, "btmrvl_main_service");
-
        priv->btmrvl_dev.hcidev = hdev;
-       priv->btmrvl_dev.card = card;
-
        hdev->driver_data = priv;
 
-       priv->btmrvl_dev.tx_dnld_rdy = true;
-
-       hdev->type = HCI_SDIO;
+       hdev->bus = HCI_SDIO;
        hdev->open = btmrvl_open;
        hdev->close = btmrvl_close;
        hdev->flush = btmrvl_flush;
@@ -639,6 +547,8 @@ struct btmrvl_private *btmrvl_add_card(void *card)
        hdev->ioctl = btmrvl_ioctl;
        hdev->owner = THIS_MODULE;
 
+       btmrvl_send_module_cfg_cmd(priv, MODULE_BRINGUP_REQ);
+
        ret = hci_register_dev(hdev);
        if (ret < 0) {
                BT_ERR("Can not register HCI device");
@@ -649,24 +559,57 @@ struct btmrvl_private *btmrvl_add_card(void *card)
        btmrvl_debugfs_init(hdev);
 #endif
 
-       BT_DBG("Leave");
-       return priv;
+       return 0;
 
 err_hci_register_dev:
-       /* Stop the thread servicing the interrupts */
-       kthread_stop(priv->main_thread.task);
-
        hci_free_dev(hdev);
 
 err_hdev:
+       /* Stop the thread servicing the interrupts */
+       kthread_stop(priv->main_thread.task);
+
        btmrvl_free_adapter(priv);
+       kfree(priv);
+
+       return -ENOMEM;
+}
+EXPORT_SYMBOL_GPL(btmrvl_register_hdev);
+
+struct btmrvl_private *btmrvl_add_card(void *card)
+{
+       struct btmrvl_private *priv;
+
+       priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+       if (!priv) {
+               BT_ERR("Can not allocate priv");
+               goto err_priv;
+       }
+
+       priv->adapter = kzalloc(sizeof(*priv->adapter), GFP_KERNEL);
+       if (!priv->adapter) {
+               BT_ERR("Allocate buffer for btmrvl_adapter failed!");
+               goto err_adapter;
+       }
+
+       btmrvl_init_adapter(priv);
+
+       BT_DBG("Starting kthread...");
+       priv->main_thread.priv = priv;
+       spin_lock_init(&priv->driver_lock);
+
+       init_waitqueue_head(&priv->main_thread.wait_q);
+       priv->main_thread.task = kthread_run(btmrvl_service_main_thread,
+                               &priv->main_thread, "btmrvl_main_service");
+
+       priv->btmrvl_dev.card = card;
+       priv->btmrvl_dev.tx_dnld_rdy = true;
+
+       return priv;
 
 err_adapter:
        kfree(priv);
 
 err_priv:
-       BT_DBG("Leave");
-
        return NULL;
 }
 EXPORT_SYMBOL_GPL(btmrvl_add_card);
@@ -675,8 +618,6 @@ int btmrvl_remove_card(struct btmrvl_private *priv)
 {
        struct hci_dev *hdev;
 
-       BT_DBG("Enter");
-
        hdev = priv->btmrvl_dev.hcidev;
 
        wake_up_interruptible(&priv->adapter->cmd_wait_q);
@@ -697,8 +638,6 @@ int btmrvl_remove_card(struct btmrvl_private *priv)
 
        kfree(priv);
 
-       BT_DBG("Leave");
-
        return 0;
 }
 EXPORT_SYMBOL_GPL(btmrvl_remove_card);