On Fri, Oct 18, 2019 at 3:29 PM Nathan Chancellor <natechancel...@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_not...@linaro.org> > Reported-by: Stephen Rothwell <s...@canb.auug.org.au> > Signed-off-by: Nathan Chancellor <natechancel...@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 <ndesaulni...@google.com> > } > #endif -- Thanks, ~Nick Desaulniers