linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marcel Holtmann <marcel@holtmann.org>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Johan Hedberg <johan.hedberg@gmail.com>,
	Alex Lu <alex_lu@realsil.com.cn>,
	Matthias Kaehlcke <mka@chromium.org>,
	Rajat Jain <rajatja@google.com>,
	Raghuram Hegde <raghuram.hegde@intel.com>,
	linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Bluetooth: btusb: avoid unused function warning
Date: Thu, 19 Sep 2019 09:32:33 +0200	[thread overview]
Message-ID: <C6D98BD8-F57F-411F-A2F2-D9E531137002@holtmann.org> (raw)
In-Reply-To: <20190918195918.2190556-1-arnd@arndb.de>

Hi Arnd,

> The btusb_rtl_cmd_timeout() function is used inside of an
> ifdef, leading to a warning when this part is hidden
> from the compiler:
> 
> drivers/bluetooth/btusb.c:530:13: error: unused function 'btusb_rtl_cmd_timeout' [-Werror,-Wunused-function]
> 
> Use an IS_ENABLED() check instead so the compiler can see
> the code and then discard it silently.
> 
> Fixes: d7ef0d1e3968 ("Bluetooth: btusb: Use cmd_timeout to reset Realtek device")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/bluetooth/btusb.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index a9c35ebb30f8..23e606aaaea4 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -3807,8 +3807,8 @@ static int btusb_probe(struct usb_interface *intf,
> 		btusb_check_needs_reset_resume(intf);
> 	}
> 
> -#ifdef CONFIG_BT_HCIBTUSB_RTL
> -	if (id->driver_info & BTUSB_REALTEK) {
> +	if (IS_ENABLED(CONFIG_BT_HCIBTUSB_RTL) &&
> +	    (id->driver_info & BTUSB_REALTEK)) {
> 		hdev->setup = btrtl_setup_realtek;
> 		hdev->shutdown = btrtl_shutdown_realtek;
> 		hdev->cmd_timeout = btusb_rtl_cmd_timeout;
> @@ -3819,7 +3819,6 @@ static int btusb_probe(struct usb_interface *intf,
> 		 */
> 		set_bit(BTUSB_WAKEUP_DISABLE, &data->flags);
> 	}
> -#endif

I prefer that we stick another ifdef around the btusb_rtl_cmd_timeout function since that is how we did it for the other vendors as well.

However I start to wonder if we need all these vendor ifdef anyway. The vendor specific functions should turn into empty stubs if their support is not selected.

Regards

Marcel


  reply	other threads:[~2019-09-19  7:32 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-18 19:59 [PATCH] Bluetooth: btusb: avoid unused function warning Arnd Bergmann
2019-09-19  7:32 ` Marcel Holtmann [this message]
2019-09-19 12:26   ` Arnd Bergmann
2019-09-19 12:36     ` Marcel Holtmann
2019-09-27  6:43 ` Marcel Holtmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=C6D98BD8-F57F-411F-A2F2-D9E531137002@holtmann.org \
    --to=marcel@holtmann.org \
    --cc=alex_lu@realsil.com.cn \
    --cc=arnd@arndb.de \
    --cc=johan.hedberg@gmail.com \
    --cc=linux-bluetooth@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mka@chromium.org \
    --cc=raghuram.hegde@intel.com \
    --cc=rajatja@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).