2019-12-26 19:04:21

by Abhishek Pandit-Subedi

Subject: [PATCH] Bluetooth: btbcm: Add missing static inline in header

This fixes a double definition error when CONFIG_BT_BCM is not set.

Signed-off-by: Abhishek Pandit-Subedi <[email protected]>
---

drivers/bluetooth/btbcm.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/bluetooth/btbcm.h b/drivers/bluetooth/btbcm.h
index 3c7dd0765837..014ef847a486 100644
--- a/drivers/bluetooth/btbcm.h
+++ b/drivers/bluetooth/btbcm.h
@@ -78,13 +78,13 @@ static inline int btbcm_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr)
return -EOPNOTSUPP;
}

-int btbcm_read_pcm_int_params(struct hci_dev *hdev,
+static inline int btbcm_read_pcm_int_params(struct hci_dev *hdev,
struct bcm_set_pcm_int_params *params)
{
return -EOPNOTSUPP;
}

-int btbcm_write_pcm_int_params(struct hci_dev *hdev,
+static inline int btbcm_write_pcm_int_params(struct hci_dev *hdev,
const struct bcm_set_pcm_int_params *params)
{
return -EOPNOTSUPP;
--
2.24.1.735.g03f4e72817-goog

2019-12-26 20:35:59

by Marcel Holtmann

Subject: Re: [PATCH] Bluetooth: btbcm: Add missing static inline in header

Hi Abhishek,

> This fixes a double definition error when CONFIG_BT_BCM is not set.
>
> Signed-off-by: Abhishek Pandit-Subedi <[email protected]>
> ---
>
> drivers/bluetooth/btbcm.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

patch has been applied to bluetooth-next tree.

Regards

Marcel