Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / bluetooth / hci_qca.c

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index 6b9b91267959f5e2d997386339f05fb55ab69721..21f4ea4ce6103764c3282f9fda18dad8b1169709 100644 (file)
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -41,13 +41,13 @@
 #define HCI_IBS_SLEEP_IND      0xFE
 #define HCI_IBS_WAKE_IND       0xFD
 #define HCI_IBS_WAKE_ACK       0xFC
-#define HCI_MAX_IBS_SIZE       10
+#define HCI_MAX_IBS_SIZE       10
 
 /* Controller states */
 #define STATE_IN_BAND_SLEEP_ENABLED    1
 
-#define IBS_WAKE_RETRANS_TIMEOUT_MS    100
-#define IBS_TX_IDLE_TIMEOUT_MS                 2000
+#define IBS_WAKE_RETRANS_TIMEOUT_MS    100
+#define IBS_TX_IDLE_TIMEOUT_MS         2000
 #define BAUDRATE_SETTLE_TIMEOUT_MS     300
 
 /* HCI_IBS transmit side sleep protocol states */
@@ -181,8 +181,8 @@ static void serial_clock_vote(unsigned long vote, struct hci_uart *hu)
                else
                        __serial_clock_off(hu->tty);
 
-               BT_DBG("Vote serial clock %s(%s)", new_vote? "true" : "false",
-                      vote? "true" : "false");
+               BT_DBG("Vote serial clock %s(%s)", new_vote ? "true" : "false",
+                      vote ? "true" : "false");
 
                diff = jiffies_to_msecs(jiffies - qca->vote_last_jif);
 
@@ -821,7 +821,7 @@ static struct sk_buff *qca_dequeue(struct hci_uart *hu)
 
 static uint8_t qca_get_baudrate_value(int speed)
 {
-       switch(speed) {
+       switch (speed) {
        case 9600:
                return QCA_BAUDRATE_9600;
        case 19200: