These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / bluetooth / hci_bcsp.c

diff --git a/kernel/drivers/bluetooth/hci_bcsp.c b/kernel/drivers/bluetooth/hci_bcsp.c
index dc8e3d4..d0b615a 100644 (file)
--- a/kernel/drivers/bluetooth/hci_bcsp.c
+++ b/kernel/drivers/bluetooth/hci_bcsp.c
@@ -47,8 +47,8 @@
 
 #include "hci_uart.h"
 
-static bool txcrc = 1;
-static bool hciextn = 1;
+static bool txcrc = true;
+static bool hciextn = true;
 
 #define BCSP_TXWINSIZE 4
 
@@ -436,7 +436,7 @@ static inline void bcsp_unslip_one_byte(struct bcsp_struct *bcsp, unsigned char
                        break;
                default:
                        memcpy(skb_put(bcsp->rx_skb, 1), &byte, 1);
-                       if ((bcsp->rx_skb-> data[0] & 0x40) != 0 && 
+                       if ((bcsp->rx_skb->data[0] & 0x40) != 0 &&
                                        bcsp->rx_state != BCSP_W4_CRC)
                                bcsp_crc_update(&bcsp->message_crc, byte);
                        bcsp->rx_count--;
@@ -447,24 +447,24 @@ static inline void bcsp_unslip_one_byte(struct bcsp_struct *bcsp, unsigned char
                switch (byte) {
                case 0xdc:
                        memcpy(skb_put(bcsp->rx_skb, 1), &c0, 1);
-                       if ((bcsp->rx_skb-> data[0] & 0x40) != 0 && 
+                       if ((bcsp->rx_skb->data[0] & 0x40) != 0 &&
                                        bcsp->rx_state != BCSP_W4_CRC)
-                               bcsp_crc_update(&bcsp-> message_crc, 0xc0);
+                               bcsp_crc_update(&bcsp->message_crc, 0xc0);
                        bcsp->rx_esc_state = BCSP_ESCSTATE_NOESC;
                        bcsp->rx_count--;
                        break;
 
                case 0xdd:
                        memcpy(skb_put(bcsp->rx_skb, 1), &db, 1);
-                       if ((bcsp->rx_skb-> data[0] & 0x40) != 0 && 
+                       if ((bcsp->rx_skb->data[0] & 0x40) != 0 &&
                                        bcsp->rx_state != BCSP_W4_CRC) 
-                               bcsp_crc_update(&bcsp-> message_crc, 0xdb);
+                               bcsp_crc_update(&bcsp->message_crc, 0xdb);
                        bcsp->rx_esc_state = BCSP_ESCSTATE_NOESC;
                        bcsp->rx_count--;
                        break;
 
                default:
-                       BT_ERR ("Invalid byte %02x after esc byte", byte);
+                       BT_ERR("Invalid byte %02x after esc byte", byte);
                        kfree_skb(bcsp->rx_skb);
                        bcsp->rx_skb = NULL;
                        bcsp->rx_state = BCSP_W4_PKT_DELIMITER;
@@ -527,7 +527,7 @@ static void bcsp_complete_rx_pkt(struct hci_uart *hu)
 
                                hci_recv_frame(hu->hdev, bcsp->rx_skb);
                        } else {
-                               BT_ERR ("Packet for unknown channel (%u %s)",
+                               BT_ERR("Packet for unknown channel (%u %s)",
                                        bcsp->rx_skb->data[1] & 0x0f,
                                        bcsp->rx_skb->data[0] & 0x80 ? 
                                        "reliable" : "unreliable");
@@ -587,7 +587,7 @@ static int bcsp_recv(struct hci_uart *hu, const void *data, int count)
                        }
                        if (bcsp->rx_skb->data[0] & 0x80        /* reliable pkt */
                                        && (bcsp->rx_skb->data[0] & 0x07) != bcsp->rxseq_txack) {
-                               BT_ERR ("Out-of-order packet arrived, got %u expected %u",
+                               BT_ERR("Out-of-order packet arrived, got %u expected %u",
                                        bcsp->rx_skb->data[0] & 0x07, bcsp->rxseq_txack);
 
                                kfree_skb(bcsp->rx_skb);