Bluetooth: btbcm: Make btbcm_setup_patchram use btbcm_finalize

On UART attached devices we do:

1. btbcm_initialize()
2. Setup UART baudrate, etc.
3. btbcm_finalize()

After our previous changes we can now also use btbcm_finalize() from
the btbcm_setup_patchram() function used on USB devices without any
functional changes. This completes unifying the USB and UART paths
as much as possible.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
index 3404021b10bd43ddc875927fc7f6b582303a0746..cc3628cace35c265dad96d195b11baa3c40c45e2 100644 (file)
--- a/drivers/bluetooth/btbcm.c
+++ b/drivers/bluetooth/btbcm.c
@@ -502,15 +502,16 @@ int btbcm_initialize(struct hci_dev *hdev, bool *fw_load_done)
 }
 EXPORT_SYMBOL_GPL(btbcm_initialize);
 
-int btbcm_finalize(struct hci_dev *hdev)
+int btbcm_finalize(struct hci_dev *hdev, bool *fw_load_done)
 {
-       bool fw_load_done = true;
        int err;
 
-       /* Re-initialize */
-       err = btbcm_initialize(hdev, &fw_load_done);
-       if (err)
-               return err;
+       /* Re-initialize if necessary */
+       if (*fw_load_done) {
+               err = btbcm_initialize(hdev, fw_load_done);
+               if (err)
+                       return err;
+       }
 
        btbcm_check_bdaddr(hdev);
 
@@ -530,20 +531,8 @@ int btbcm_setup_patchram(struct hci_dev *hdev)
        if (err)
                return err;
 
-       if (!fw_load_done)
-               goto done;
-
        /* Re-initialize after loading Patch */
-       err = btbcm_initialize(hdev, &fw_load_done);
-       if (err)
-               return err;
-
-done:
-       btbcm_check_bdaddr(hdev);
-
-       set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);
-
-       return 0;
+       return btbcm_finalize(hdev, &fw_load_done);
 }
 EXPORT_SYMBOL_GPL(btbcm_setup_patchram);
 

diff --git a/drivers/bluetooth/btbcm.h b/drivers/bluetooth/btbcm.h
index 8437caba421d75463d18a0c1b51fcfc4fe21cfa6..8bf01565fdfca4272e74508e38f18fe7621acc1d 100644 (file)
--- a/drivers/bluetooth/btbcm.h
+++ b/drivers/bluetooth/btbcm.h
@@ -63,7 +63,7 @@ int btbcm_setup_patchram(struct hci_dev *hdev);
 int btbcm_setup_apple(struct hci_dev *hdev);
 
 int btbcm_initialize(struct hci_dev *hdev, bool *fw_load_done);
-int btbcm_finalize(struct hci_dev *hdev);
+int btbcm_finalize(struct hci_dev *hdev, bool *fw_load_done);
 
 #else
 
@@ -109,7 +109,7 @@ static inline int btbcm_initialize(struct hci_dev *hdev, bool *fw_load_done)
        return 0;
 }
 
-static inline int btbcm_finalize(struct hci_dev *hdev)
+static inline int btbcm_finalize(struct hci_dev *hdev, bool *fw_load_done)
 {
        return 0;
 }

diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index 61731cb451cb7fd631b984c83345b7249cc7b49a..8ea5ca8d71d6d2260965cfc1c9f4ae0e0a645d13 100644 (file)
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -606,7 +606,7 @@ static int bcm_setup(struct hci_uart *hu)
                btbcm_write_pcm_int_params(hu->hdev, &params);
        }
 
-       err = btbcm_finalize(hu->hdev);
+       err = btbcm_finalize(hu->hdev, &fw_load_done);
        if (err)
                return err;