[PATCH] Bluetooth: btintel: remove extraneous semicolon

[PATCH] Bluetooth: btintel: remove extraneous semicolon

[Arnd Bergmann]

The newly added btintel_download_firmware() dummy helper definition is
incorrect, causing a build error when CONFIG_BT_INTEL is disabled:

In file included from drivers/bluetooth/hci_ldisc.c:49:0:
drivers/bluetooth/btintel.h:196:1: error: expected identifier or '(' before '{' token
drivers/bluetooth/btintel.h:193:19: error: 'btintel_download_firmware' declared 'static' but never defined [-Werror=unused-function]

Removing the semicolon makes it work again.

Fixes: 0bd4ded3287d ("Bluetooth: btintel: Create common function for firmware download")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/bluetooth/btintel.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h
index 01728e212267..41c642cc523f 100644
--- a/drivers/bluetooth/btintel.h
+++ b/drivers/bluetooth/btintel.h
@@ -192,7 +192,7 @@ static inline int btintel_read_boot_params(struct hci_dev *hdev,
 
 static inline int btintel_download_firmware(struct hci_dev *dev,
 					    const struct firmware *fw,
-					    u32 *boot_param);
+					    u32 *boot_param)
 {
 	return -EOPNOTSUPP;
 }
-- 
2.9.0

Re: [PATCH] Bluetooth: btintel: remove extraneous semicolon

[Marcel Holtmann]

Hi Arnd,

> The newly added btintel_download_firmware() dummy helper definition is
> incorrect, causing a build error when CONFIG_BT_INTEL is disabled:
> 
> In file included from drivers/bluetooth/hci_ldisc.c:49:0:
> drivers/bluetooth/btintel.h:196:1: error: expected identifier or '(' before '{' token
> drivers/bluetooth/btintel.h:193:19: error: 'btintel_download_firmware' declared 'static' but never defined [-Werror=unused-function]
> 
> Removing the semicolon makes it work again.
> 
> Fixes: 0bd4ded3287d ("Bluetooth: btintel: Create common function for firmware download")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/bluetooth/btintel.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h
> index 01728e212267..41c642cc523f 100644
> --- a/drivers/bluetooth/btintel.h
> +++ b/drivers/bluetooth/btintel.h
> @@ -192,7 +192,7 @@ static inline int btintel_read_boot_params(struct hci_dev *hdev,
> 
> static inline int btintel_download_firmware(struct hci_dev *dev,
> 					    const struct firmware *fw,
> -					    u32 *boot_param);
> +					    u32 *boot_param)
> {
> 	return -EOPNOTSUPP;
> }

didn’t I fix this before sending the pull request? Can you check against net-next tree that this is still an issue?

Regards

Marcel

Re: [PATCH] Bluetooth: btintel: remove extraneous semicolon

[Arnd Bergmann]

On Fri, Jan 26, 2018 at 4:22 PM, Marcel Holtmann <marcel@holtmann.org> wrot=
e:
> Hi Arnd,
>
>> The newly added btintel_download_firmware() dummy helper definition is
>> incorrect, causing a build error when CONFIG_BT_INTEL is disabled:
>>
>> In file included from drivers/bluetooth/hci_ldisc.c:49:0:
>> drivers/bluetooth/btintel.h:196:1: error: expected identifier or '(' bef=
ore '{' token
>> drivers/bluetooth/btintel.h:193:19: error: 'btintel_download_firmware' d=
eclared 'static' but never defined [-Werror=3Dunused-function]
>>
>> Removing the semicolon makes it work again.
>>
>> Fixes: 0bd4ded3287d ("Bluetooth: btintel: Create common function for fir=
mware download")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> ---
>> drivers/bluetooth/btintel.h | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h
>> index 01728e212267..41c642cc523f 100644
>> --- a/drivers/bluetooth/btintel.h
>> +++ b/drivers/bluetooth/btintel.h
>> @@ -192,7 +192,7 @@ static inline int btintel_read_boot_params(struct hc=
i_dev *hdev,
>>
>> static inline int btintel_download_firmware(struct hci_dev *dev,
>>                                           const struct firmware *fw,
>> -                                         u32 *boot_param);
>> +                                         u32 *boot_param)
>> {
>>       return -EOPNOTSUPP;
>> }
>
> didn=E2=80=99t I fix this before sending the pull request? Can you check =
against
> net-next tree that this is still an issue?

It's fixed in net-next. I looked at linux-next, which apparently had an
older version of the commit when Stephen pulled the tree into today's
linux-next, through bluetooth-next.git#master.

         Arnd