Bluetooth: Remove the cmd timeout count in btusb

Remove the cmd timeout count in btusb since we only ever allow one
command in flight at a time. We should always reset after a single
command times out.

Signed-off-by: Hsin-chen Chuang <chharry@chromium.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index abdb07d71be075afa8019ffc966c387057049a05..9f267b70f6ab4ef20565df5836132d446dc5a986 100644 (file)
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -890,7 +890,6 @@ struct btusb_data {
        int (*disconnect)(struct hci_dev *hdev);
 
        int oob_wake_irq;   /* irq for out-of-band wake-on-bt */
-       unsigned cmd_timeout_cnt;
 
        struct qca_dump_info qca_dump;
 };
@@ -923,9 +922,6 @@ static void btusb_intel_cmd_timeout(struct hci_dev *hdev)
        struct gpio_desc *reset_gpio = data->reset_gpio;
        struct btintel_data *intel_data = hci_get_priv(hdev);
 
-       if (++data->cmd_timeout_cnt < 5)
-               return;
-
        if (intel_data->acpi_reset_method) {
                if (test_and_set_bit(INTEL_ACPI_RESET_ACTIVE, intel_data->flags)) {
                        bt_dev_err(hdev, "acpi: last reset failed ? Not resetting again");
@@ -1008,9 +1004,6 @@ static void btusb_rtl_cmd_timeout(struct hci_dev *hdev)
 
        btusb_rtl_alloc_devcoredump(hdev, &hdr, NULL, 0);
 
-       if (++data->cmd_timeout_cnt < 5)
-               return;
-
        if (!reset_gpio) {
                btusb_reset(hdev);
                return;
@@ -1055,9 +1048,6 @@ static void btusb_qca_cmd_timeout(struct hci_dev *hdev)
                return;
        }
 
-       if (++data->cmd_timeout_cnt < 5)
-               return;
-
        if (reset_gpio) {
                bt_dev_err(hdev, "Reset qca device via bt_en gpio");