Merge remote-tracking branch 'driver-core/driver-core-next'

[karo-tx-linux.git] / drivers / bluetooth / hci_qca.c

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index 50947768166191162bfbfa4e1e307eeade6e45b5..71325e443e4631e732c457134cf99822f2610700 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);
 
@@ -347,7 +347,7 @@ static void hci_ibs_wake_retrans_timeout(unsigned long arg)
        struct hci_uart *hu = (struct hci_uart *)arg;
        struct qca_data *qca = hu->priv;
        unsigned long flags, retrans_delay;
-       unsigned long retransmit = 0;
+       bool retransmit = false;
 
        BT_DBG("hu %p wake retransmit timeout in %d state",
                hu, qca->tx_ibs_state);
@@ -358,7 +358,7 @@ static void hci_ibs_wake_retrans_timeout(unsigned long arg)
        switch (qca->tx_ibs_state) {
        case HCI_IBS_TX_WAKING:
                /* No WAKE_ACK, retransmit WAKE */
-               retransmit = 1;
+               retransmit = true;
                if (send_hci_ibs_cmd(HCI_IBS_WAKE_IND, hu) < 0) {
                        BT_ERR("Failed to acknowledge device wake up");
                        break;
@@ -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:
@@ -947,6 +947,7 @@ static int qca_setup(struct hci_uart *hu)
 static struct hci_uart_proto qca_proto = {
        .id             = HCI_UART_QCA,
        .name           = "QCA",
+       .manufacturer   = 29,
        .init_speed     = 115200,
        .oper_speed     = 3000000,
        .open           = qca_open,