aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_core.c
diff options
context:
space:
mode:
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>2012-06-11 04:13:09 -0400
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-06-11 23:08:54 -0400
commitf0e0951007b051046587e73ffc9716caa024d537 (patch)
tree21105b498b8fef90ddb55ac542ee72a287e89fc8 /net/bluetooth/hci_core.c
parentbda4f23a5c20deabb07545591be872145528b4ed (diff)
Bluetooth: Correct debug print specifier for u16 objects
Some functions print u16 objects as "0xc03" others as "0x0c03". Patch ensures that opcodes printed are the in the same format and consistent with bluetooth code. Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth/hci_core.c')
-rw-r--r--net/bluetooth/hci_core.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 88858963ec21..f7a35cc400cf 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -61,7 +61,7 @@ static void hci_notify(struct hci_dev *hdev, int event)
61 61
62void hci_req_complete(struct hci_dev *hdev, __u16 cmd, int result) 62void hci_req_complete(struct hci_dev *hdev, __u16 cmd, int result)
63{ 63{
64 BT_DBG("%s command 0x%04x result 0x%2.2x", hdev->name, cmd, result); 64 BT_DBG("%s command 0x%4.4x result 0x%2.2x", hdev->name, cmd, result);
65 65
66 /* If this is the init phase check if the completed command matches 66 /* If this is the init phase check if the completed command matches
67 * the last init command, and if not just return. 67 * the last init command, and if not just return.
@@ -2092,7 +2092,7 @@ int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param)
2092 struct hci_command_hdr *hdr; 2092 struct hci_command_hdr *hdr;
2093 struct sk_buff *skb; 2093 struct sk_buff *skb;
2094 2094
2095 BT_DBG("%s opcode 0x%x plen %d", hdev->name, opcode, plen); 2095 BT_DBG("%s opcode 0x%4.4x plen %d", hdev->name, opcode, plen);
2096 2096
2097 skb = bt_skb_alloc(len, GFP_ATOMIC); 2097 skb = bt_skb_alloc(len, GFP_ATOMIC);
2098 if (!skb) { 2098 if (!skb) {
@@ -2134,7 +2134,7 @@ void *hci_sent_cmd_data(struct hci_dev *hdev, __u16 opcode)
2134 if (hdr->opcode != cpu_to_le16(opcode)) 2134 if (hdr->opcode != cpu_to_le16(opcode))
2135 return NULL; 2135 return NULL;
2136 2136
2137 BT_DBG("%s opcode 0x%x", hdev->name, opcode); 2137 BT_DBG("%s opcode 0x%4.4x", hdev->name, opcode);
2138 2138
2139 return hdev->sent_cmd->data + HCI_COMMAND_HDR_SIZE; 2139 return hdev->sent_cmd->data + HCI_COMMAND_HDR_SIZE;
2140} 2140}
@@ -2204,7 +2204,7 @@ void hci_send_acl(struct hci_chan *chan, struct sk_buff *skb, __u16 flags)
2204 struct hci_conn *conn = chan->conn; 2204 struct hci_conn *conn = chan->conn;
2205 struct hci_dev *hdev = conn->hdev; 2205 struct hci_dev *hdev = conn->hdev;
2206 2206
2207 BT_DBG("%s chan %p flags 0x%x", hdev->name, chan, flags); 2207 BT_DBG("%s chan %p flags 0x%4.4x", hdev->name, chan, flags);
2208 2208
2209 skb->dev = (void *) hdev; 2209 skb->dev = (void *) hdev;
2210 2210
@@ -2704,7 +2704,7 @@ static void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb)
2704 flags = hci_flags(handle); 2704 flags = hci_flags(handle);
2705 handle = hci_handle(handle); 2705 handle = hci_handle(handle);
2706 2706
2707 BT_DBG("%s len %d handle 0x%x flags 0x%x", hdev->name, skb->len, 2707 BT_DBG("%s len %d handle 0x%4.4x flags 0x%4.4x", hdev->name, skb->len,
2708 handle, flags); 2708 handle, flags);
2709 2709
2710 hdev->stat.acl_rx++; 2710 hdev->stat.acl_rx++;
@@ -2746,7 +2746,7 @@ static void hci_scodata_packet(struct hci_dev *hdev, struct sk_buff *skb)
2746 2746
2747 handle = __le16_to_cpu(hdr->handle); 2747 handle = __le16_to_cpu(hdr->handle);
2748 2748
2749 BT_DBG("%s len %d handle 0x%x", hdev->name, skb->len, handle); 2749 BT_DBG("%s len %d handle 0x%4.4x", hdev->name, skb->len, handle);
2750 2750
2751 hdev->stat.sco_rx++; 2751 hdev->stat.sco_rx++;
2752 2752