summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2012-07-16 15:12:13 +0200
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-07-17 19:48:32 +0200
commit255a68e0124082396d5e6a073ae80f2c41d9c886 (patch)
tree40c5b0455c536e02101de13cdddce54d1a1feb80 /drivers/bluetooth
parentBluetooth: Use delayed init for Three-wire UART (diff)
downloadlinux-255a68e0124082396d5e6a073ae80f2c41d9c886.tar.xz
linux-255a68e0124082396d5e6a073ae80f2c41d9c886.zip
Bluetooth: Improve rx debug logs for Three-wire UART
Remove unnecessary debug logs and add some to more centralized places. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/hci_h5.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
index 3c0e17b4602d..eb40b9a38289 100644
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
@@ -246,8 +246,6 @@ static void h5_complete_rx_pkt(struct hci_uart *hu)
struct h5 *h5 = hu->priv;
const unsigned char *hdr = h5->rx_skb->data;
- BT_DBG("%s", hu->hdev->name);
-
if (H5_HDR_RELIABLE(hdr)) {
h5->tx_ack = (h5->tx_ack + 1) % 8;
h5->tx_ack_req = true;
@@ -284,8 +282,6 @@ static int h5_rx_crc(struct hci_uart *hu, unsigned char c)
{
struct h5 *h5 = hu->priv;
- BT_DBG("%s 0x%02hhx", hu->hdev->name, c);
-
h5_complete_rx_pkt(hu);
h5_reset_rx(h5);
@@ -297,8 +293,6 @@ static int h5_rx_payload(struct hci_uart *hu, unsigned char c)
struct h5 *h5 = hu->priv;
const unsigned char *hdr = h5->rx_skb->data;
- BT_DBG("%s 0x%02hhx", hu->hdev->name, c);
-
if (H5_HDR_CRC(hdr)) {
h5->rx_func = h5_rx_crc;
h5->rx_pending = 2;
@@ -315,8 +309,6 @@ static int h5_rx_3wire_hdr(struct hci_uart *hu, unsigned char c)
struct h5 *h5 = hu->priv;
const unsigned char *hdr = h5->rx_skb->data;
- BT_DBG("%s 0x%02hhx", hu->hdev->name, c);
-
BT_DBG("%s rx: seq %u ack %u crc %u rel %u type %u len %u",
hu->hdev->name, H5_HDR_SEQ(hdr), H5_HDR_ACK(hdr),
H5_HDR_CRC(hdr), H5_HDR_RELIABLE(hdr), H5_HDR_PKT_TYPE(hdr),
@@ -345,8 +337,6 @@ static int h5_rx_pkt_start(struct hci_uart *hu, unsigned char c)
{
struct h5 *h5 = hu->priv;
- BT_DBG("%s 0x%02hhx", hu->hdev->name, c);
-
if (c == SLIP_DELIMITER)
return 1;
@@ -369,8 +359,6 @@ static int h5_rx_delimiter(struct hci_uart *hu, unsigned char c)
{
struct h5 *h5 = hu->priv;
- BT_DBG("%s 0x%02hhx", hu->hdev->name, c);
-
if (c == SLIP_DELIMITER)
h5->rx_func = h5_rx_pkt_start;
@@ -407,7 +395,7 @@ static void h5_unslip_one_byte(struct h5 *h5, unsigned char c)
memcpy(skb_put(h5->rx_skb, 1), byte, 1);
h5->rx_pending--;
- BT_DBG("unsliped 0x%02hhx", *byte);
+ BT_DBG("unsliped 0x%02hhx, rx_pending %zu", *byte, h5->rx_pending);
}
static void h5_reset_rx(struct h5 *h5)
@@ -427,7 +415,8 @@ static int h5_recv(struct hci_uart *hu, void *data, int count)
struct h5 *h5 = hu->priv;
unsigned char *ptr = data;
- BT_DBG("%s count %d", hu->hdev->name, count);
+ BT_DBG("%s pending %zu count %d", hu->hdev->name, h5->rx_pending,
+ count);
while (count > 0) {
int processed;