Bluetooth: btusb: Use IS_ENABLED instead of #ifdef
Marcel Holtmann
maintainerPATCH 1/1 Bluetooth: btusb: Use IS_ENABLED instead of #ifdef
For the different hardware support options, it is better to use IS_ENABLED check. Let the compiler do the needed optimizations.
Signed-off-by Marcel Holtmann <[email protected]>
--- drivers/bluetooth/btusb.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)
drivers/bluetooth/btusb.c +7 -15
@@ -2496,8 +2496,6 @@ static int btusb_shutdown_intel_new(struct hci_dev *hdev)return 0 ; } -#ifdef CONFIG_BT_HCIBTUSB_MTK -#define FIRMWARE_MT7663 "mediatek/mt7663pr2h.bin"#define FIRMWARE_MT7668 "mediatek/mt7668pr2h.bin"
@@ -3058,7 +3056,6 @@ static int btusb_mtk_shutdown(struct hci_dev *hdev)MODULE_FIRMWARE (FIRMWARE_MT7663 );MODULE_FIRMWARE (FIRMWARE_MT7668 ); -#endif #ifdef CONFIG_PM /* Configure an out-of-band gpio as wake-up pin, if specified in device tree */
@@ -3418,7 +3415,6 @@ static int btusb_setup_qca(struct hci_dev *hdev)return 0 ; } -#ifdef CONFIG_BT_HCIBTUSB_BCM static inline int __set_diag_interface (struct hci_dev *hdev) {struct btusb_data *data =hci_get_drvdata (hdev);
@@ -3505,7 +3501,6 @@ static int btusb_bcm_set_diag(struct hci_dev *hdev, bool enable)return submit_or_queue_tx_urb (hdev, urb); } -#endif #ifdef CONFIG_PM static irqreturn_t btusb_oob_wake_handler (int irq,void *priv)
@@ -3731,8 +3726,8 @@ static int btusb_probe(struct usb_interface *intf,if (id->driver_info &BTUSB_BCM92035 ) hdev->setup = btusb_setup_bcm92035; -#ifdef CONFIG_BT_HCIBTUSB_BCM -if (id->driver_info &BTUSB_BCM_PATCHRAM ) { +if (IS_ENABLED (CONFIG_BT_HCIBTUSB_BCM ) && + (id->driver_info &BTUSB_BCM_PATCHRAM )) { hdev->manufacturer =15 ; hdev->setup = btbcm_setup_patchram; hdev->set_diag = btusb_bcm_set_diag;
@@ -3742,7 +3737,8 @@ static int btusb_probe(struct usb_interface *intf, data->diag =usb_ifnum_to_if (data->udev, ifnum_base +2 ); } -if (id->driver_info &BTUSB_BCM_APPLE ) { +if (IS_ENABLED (CONFIG_BT_HCIBTUSB_BCM ) && + (id->driver_info &BTUSB_BCM_APPLE )) { hdev->manufacturer =15 ; hdev->setup = btbcm_setup_apple; hdev->set_diag = btusb_bcm_set_diag;
@@ -3750,7 +3746,6 @@ static int btusb_probe(struct usb_interface *intf,/* Broadcom LM_DIAG Interface numbers are hardcoded */ data->diag =usb_ifnum_to_if (data->udev, ifnum_base +2 ); } -#endif if (id->driver_info &BTUSB_INTEL ) { hdev->manufacturer =2 ;
@@ -3781,14 +3776,13 @@ static int btusb_probe(struct usb_interface *intf,if (id->driver_info &BTUSB_MARVELL ) hdev->set_bdaddr = btusb_set_bdaddr_marvell; -#ifdef CONFIG_BT_HCIBTUSB_MTK -if (id->driver_info &BTUSB_MEDIATEK ) { +if (IS_ENABLED (CONFIG_BT_HCIBTUSB_MTK ) && + (id->driver_info &BTUSB_MEDIATEK )) { hdev->setup = btusb_mtk_setup; hdev->shutdown = btusb_mtk_shutdown; hdev->manufacturer =70 ;set_bit (HCI_QUIRK_NON_PERSISTENT_SETUP , &hdev->quirks); } -#endif if (id->driver_info &BTUSB_SWAVE ) {set_bit (HCI_QUIRK_FIXUP_INQUIRY_MODE , &hdev->quirks);
@@ -3893,15 +3887,13 @@ static int btusb_probe(struct usb_interface *intf, goto out_free_dev; } -#ifdef CONFIG_BT_HCIBTUSB_BCM -if (data->diag) { +if (IS_ENABLED (CONFIG_BT_HCIBTUSB_BCM ) && data->diag) {if (!usb_driver_claim_interface (&btusb_driver, data->diag, data))__set_diag_interface (hdev);else data->diag =NULL ; } -#endif if (enable_autosuspend)usb_enable_autosuspend (data->udev);
Signature · 1 line
2.20.1
Johan Hedberg
AppliedHi Marcel,
Quoted 7 lines · Marcel Holtmann
For the different hardware support options, it is better to use
IS_ENABLEDcheck. Let the compiler do the needed optimizations.Signed-off-by Marcel Holtmann <[email protected]>--- drivers/bluetooth/btusb.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)
Applied to bluetooth-next. Thanks.
Johan