Bluetooth: Remove Enter/Leave debug statements from Marvell driver
[linux-3.10.git] / drivers / bluetooth / btmrvl_main.c
index 61168ec..e605563 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);
 
@@ -76,8 +68,6 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)
        struct btmrvl_event *event;
        u8 ret = 0;
 
-       BT_DBG("Enter");
-
        event = (struct btmrvl_event *) skb->data;
        if (event->ec != 0xff) {
                BT_DBG("Not Marvell Event=%x", event->ec);
@@ -151,8 +141,6 @@ exit:
        if (!ret)
                kfree_skb(skb);
 
-       BT_DBG("Leave");
-
        return ret;
 }
 EXPORT_SYMBOL_GPL(btmrvl_process_event);
@@ -161,25 +149,21 @@ 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->tail;
-       cmd->ocf_ogf = cpu_to_le16((OGF << 10) | BT_CMD_MODULE_CFG_REQ);
+       cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));
+       cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_MODULE_CFG_REQ));
        cmd->length = 1;
        cmd->data[0] = subcmd;
 
        bt_cb(skb)->pkt_type = MRVL_VENDOR_PKT;
 
-       skb_put(skb, sizeof(*cmd));
        skb->dev = (void *) priv->btmrvl_dev.hcidev;
        skb_queue_head(&priv->adapter->tx_queue, skb);
 
@@ -201,9 +185,6 @@ 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);
@@ -212,24 +193,20 @@ static int btmrvl_enable_hs(struct btmrvl_private *priv)
 {
        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->tail;
-       cmd->ocf_ogf = cpu_to_le16((OGF << 10) | BT_CMD_HOST_SLEEP_ENABLE);
+       cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));
+       cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_HOST_SLEEP_ENABLE));
        cmd->length = 0;
 
        bt_cb(skb)->pkt_type = MRVL_VENDOR_PKT;
 
-       skb_put(skb, sizeof(*cmd));
        skb->dev = (void *) priv->btmrvl_dev.hcidev;
        skb_queue_head(&priv->adapter->tx_queue, skb);
 
@@ -246,9 +223,6 @@ static int btmrvl_enable_hs(struct btmrvl_private *priv)
                                                priv->adapter->wakeup_tries);
        }
 
-exit:
-       BT_DBG("Leave");
-
        return ret;
 }
 
@@ -256,9 +230,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;
@@ -266,20 +238,17 @@ 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->tail;
-               cmd->ocf_ogf = cpu_to_le16((OGF << 10) |
-                                               BT_CMD_HOST_SLEEP_CONFIG);
+               cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));
+               cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_HOST_SLEEP_CONFIG));
                cmd->length = 2;
                cmd->data[0] = (priv->btmrvl_dev.gpio_gap & 0xff00) >> 8;
                cmd->data[1] = (u8) (priv->btmrvl_dev.gpio_gap & 0x00ff);
 
                bt_cb(skb)->pkt_type = MRVL_VENDOR_PKT;
 
-               skb_put(skb, sizeof(*cmd));
                skb->dev = (void *) priv->btmrvl_dev.hcidev;
                skb_queue_head(&priv->adapter->tx_queue, skb);
 
@@ -293,13 +262,11 @@ 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->tail;
-               cmd->ocf_ogf = cpu_to_le16((OGF << 10) |
-                                               BT_CMD_AUTO_SLEEP_MODE);
+               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)
@@ -309,7 +276,6 @@ int btmrvl_prepare_command(struct btmrvl_private *priv)
 
                bt_cb(skb)->pkt_type = MRVL_VENDOR_PKT;
 
-               skb_put(skb, sizeof(*cmd));
                skb->dev = (void *) priv->btmrvl_dev.hcidev;
                skb_queue_head(&priv->adapter->tx_queue, skb);
 
@@ -327,27 +293,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;
        }
 
@@ -359,7 +317,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;
                }
 
@@ -381,52 +338,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)
@@ -434,11 +374,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;
        }
 
@@ -447,7 +386,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;
        }
 
@@ -469,8 +407,6 @@ static int btmrvl_send_frame(struct sk_buff *skb)
 
        wake_up_interruptible(&priv->main_thread.wait_q);
 
-       BT_DBG("Leave");
-
        return 0;
 }
 
@@ -478,12 +414,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;
 }
 
@@ -491,28 +423,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;
 }
 
@@ -529,8 +451,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;
@@ -588,8 +508,6 @@ static int btmrvl_service_main_thread(void *data)
                }
        }
 
-       BT_DBG("Leave");
-
        return 0;
 }
 
@@ -599,8 +517,6 @@ struct btmrvl_private *btmrvl_add_card(void *card)
        struct btmrvl_private *priv;
        int ret;
 
-       BT_DBG("Enter");
-
        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
        if (!priv) {
                BT_ERR("Can not allocate priv");
@@ -655,7 +571,6 @@ struct btmrvl_private *btmrvl_add_card(void *card)
        btmrvl_debugfs_init(hdev);
 #endif
 
-       BT_DBG("Leave");
        return priv;
 
 err_hci_register_dev:
@@ -671,8 +586,6 @@ err_adapter:
        kfree(priv);
 
 err_priv:
-       BT_DBG("Leave");
-
        return NULL;
 }
 EXPORT_SYMBOL_GPL(btmrvl_add_card);
@@ -681,8 +594,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);
@@ -703,8 +614,6 @@ int btmrvl_remove_card(struct btmrvl_private *priv)
 
        kfree(priv);
 
-       BT_DBG("Leave");
-
        return 0;
 }
 EXPORT_SYMBOL_GPL(btmrvl_remove_card);