Linux bluetooth development
 help / color / mirror / Atom feed
* [PATCH -next] Bluetooth: btusb: Remove return statement in btintel_reset_to_bootloader
       [not found] <20191018111343.5a34ee33@canb.auug.org.au>
@ 2019-10-18 22:29 ` Nathan Chancellor
  2019-10-18 22:39   ` Nick Desaulniers
  2019-10-19  7:57   ` Marcel Holtmann
  0 siblings, 2 replies; 3+ messages in thread
From: Nathan Chancellor @ 2019-10-18 22:29 UTC (permalink / raw)
  To: Marcel Holtmann, Johan Hedberg
  Cc: Amit K Bag, Chethan T N, Raghuram Hegde, linux-bluetooth,
	linux-kernel, clang-built-linux, Stephen Rothwell,
	Nathan Chancellor

When building with Clang and CONFIG_BT_INTEL unset, the following error
occurs:

In file included from drivers/bluetooth/hci_ldisc.c:34:
drivers/bluetooth/btintel.h:188:2: error: void function
'btintel_reset_to_bootloader' should not return a value [-Wreturn-type]
        return -EOPNOTSUPP;
        ^      ~~~~~~~~~~~
1 error generated.

Remove the unneeded return statement to fix this.

Fixes: b9a2562f4918 ("Bluetooth: btusb: Trigger Intel FW download error recovery")
Link: https://github.com/ClangBuiltLinux/linux/issues/743
Reported-by: <ci_notify@linaro.org>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
---
 drivers/bluetooth/btintel.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h
index d2311156f778..a69ea8a87b9b 100644
--- a/drivers/bluetooth/btintel.h
+++ b/drivers/bluetooth/btintel.h
@@ -185,6 +185,5 @@ static inline int btintel_download_firmware(struct hci_dev *dev,
 
 static inline void btintel_reset_to_bootloader(struct hci_dev *hdev)
 {
-	return -EOPNOTSUPP;
 }
 #endif
-- 
2.23.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH -next] Bluetooth: btusb: Remove return statement in btintel_reset_to_bootloader
  2019-10-18 22:29 ` [PATCH -next] Bluetooth: btusb: Remove return statement in btintel_reset_to_bootloader Nathan Chancellor
@ 2019-10-18 22:39   ` Nick Desaulniers
  2019-10-19  7:57   ` Marcel Holtmann
  1 sibling, 0 replies; 3+ messages in thread
From: Nick Desaulniers @ 2019-10-18 22:39 UTC (permalink / raw)
  To: Nathan Chancellor
  Cc: Marcel Holtmann, Johan Hedberg, Amit K Bag, Chethan T N,
	Raghuram Hegde, linux-bluetooth, LKML, clang-built-linux,
	Stephen Rothwell

On Fri, Oct 18, 2019 at 3:29 PM Nathan Chancellor
<natechancellor@gmail.com> wrote:
>
> When building with Clang and CONFIG_BT_INTEL unset, the following error
> occurs:
>
> In file included from drivers/bluetooth/hci_ldisc.c:34:
> drivers/bluetooth/btintel.h:188:2: error: void function
> 'btintel_reset_to_bootloader' should not return a value [-Wreturn-type]
>         return -EOPNOTSUPP;
>         ^      ~~~~~~~~~~~
> 1 error generated.
>
> Remove the unneeded return statement to fix this.
>
> Fixes: b9a2562f4918 ("Bluetooth: btusb: Trigger Intel FW download error recovery")
> Link: https://github.com/ClangBuiltLinux/linux/issues/743
> Reported-by: <ci_notify@linaro.org>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
> ---
>  drivers/bluetooth/btintel.h | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h
> index d2311156f778..a69ea8a87b9b 100644
> --- a/drivers/bluetooth/btintel.h
> +++ b/drivers/bluetooth/btintel.h
> @@ -185,6 +185,5 @@ static inline int btintel_download_firmware(struct hci_dev *dev,
>
>  static inline void btintel_reset_to_bootloader(struct hci_dev *hdev)
>  {
> -       return -EOPNOTSUPP;


The existing structure of this code is fishy, but I see what is going on with:
 65 #if IS_ENABLED(CONFIG_BT_INTEL)
drivers/bluetooth/btintel.h

Thanks for the patch
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>

>  }
>  #endif

-- 
Thanks,
~Nick Desaulniers

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH -next] Bluetooth: btusb: Remove return statement in btintel_reset_to_bootloader
  2019-10-18 22:29 ` [PATCH -next] Bluetooth: btusb: Remove return statement in btintel_reset_to_bootloader Nathan Chancellor
  2019-10-18 22:39   ` Nick Desaulniers
@ 2019-10-19  7:57   ` Marcel Holtmann
  1 sibling, 0 replies; 3+ messages in thread
From: Marcel Holtmann @ 2019-10-19  7:57 UTC (permalink / raw)
  To: Nathan Chancellor
  Cc: Johan Hedberg, Amit K Bag, Chethan T N, Raghuram Hegde,
	linux-bluetooth, linux-kernel, clang-built-linux,
	Stephen Rothwell

Hi Nathan,

> When building with Clang and CONFIG_BT_INTEL unset, the following error
> occurs:
> 
> In file included from drivers/bluetooth/hci_ldisc.c:34:
> drivers/bluetooth/btintel.h:188:2: error: void function
> 'btintel_reset_to_bootloader' should not return a value [-Wreturn-type]
>        return -EOPNOTSUPP;
>        ^      ~~~~~~~~~~~
> 1 error generated.
> 
> Remove the unneeded return statement to fix this.
> 
> Fixes: b9a2562f4918 ("Bluetooth: btusb: Trigger Intel FW download error recovery")
> Link: https://github.com/ClangBuiltLinux/linux/issues/743
> Reported-by: <ci_notify@linaro.org>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
> ---
> drivers/bluetooth/btintel.h | 1 -
> 1 file changed, 1 deletion(-)

patch has been applied to bluetooth-next tree.

Regards

Marcel


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-10-19  7:57 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <20191018111343.5a34ee33@canb.auug.org.au>
2019-10-18 22:29 ` [PATCH -next] Bluetooth: btusb: Remove return statement in btintel_reset_to_bootloader Nathan Chancellor
2019-10-18 22:39   ` Nick Desaulniers
2019-10-19  7:57   ` Marcel Holtmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox