summaryrefslogtreecommitdiff
path: root/drivers/bluetooth/btbcm.h
diff options
context:
space:
mode:
authorFrederic Danis <frederic.danis@linux.intel.com>2015-05-28 12:25:01 +0300
committerMarcel Holtmann <marcel@holtmann.org>2015-06-06 08:29:56 +0300
commit18aeb4445aa00f6f402ba3a92a2e9ff3d13882b4 (patch)
treee1e3b2733d4fd91ec222bd45788a81da532017ab /drivers/bluetooth/btbcm.h
parent133be0264f28e59d772c6a259349ba3ee2b183b3 (diff)
downloadlinux-18aeb4445aa00f6f402ba3a92a2e9ff3d13882b4.tar.xz
Bluetooth: btbcm: Move request/release_firmware()
Move request/release_firmware() out of btbcm_patchram(). This allows a better error management, if request_firmware() returns an error then the controller will be used without firmware loading and 0 is returned. This will imply to change btbcm_patchram() to accept a firmware instead of firmware name. Signed-off-by: Frederic Danis <frederic.danis@linux.intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth/btbcm.h')
-rw-r--r--drivers/bluetooth/btbcm.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bluetooth/btbcm.h b/drivers/bluetooth/btbcm.h
index eb6ab5f9483d..42f26a6c7f81 100644
--- a/drivers/bluetooth/btbcm.h
+++ b/drivers/bluetooth/btbcm.h
@@ -25,7 +25,7 @@
int btbcm_check_bdaddr(struct hci_dev *hdev);
int btbcm_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr);
-int btbcm_patchram(struct hci_dev *hdev, const char *firmware);
+int btbcm_patchram(struct hci_dev *hdev, const struct firmware *fw);
int btbcm_setup_patchram(struct hci_dev *hdev);
int btbcm_setup_apple(struct hci_dev *hdev);
@@ -42,7 +42,7 @@ static inline int btbcm_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr)
return -EOPNOTSUPP;
}
-static inline int btbcm_patchram(struct hci_dev *hdev, const char *firmware)
+static inline int btbcm_patchram(struct hci_dev *hdev, const struct firmware *fw)
{
return -EOPNOTSUPP;
}