Commit 6d83f1ee authored Jan 10, 2018 by Lukas Wunner Committed by Marcel Holtmann Jan 10, 2018

Bluetooth: hci_bcm: Clean up unnecessary #ifdef



pm_runtime_disable() and pm_runtime_set_suspended() are replaced with
empty inlines if CONFIG_PM is disabled, so there's no need to #ifdef
them.

device_init_wakeup() is likewise replaced with an inline, though it's
not empty, but it and devm_free_irq() can be made conditional on
IS_ENABLED(CONFIG_PM), which is preferable to #ifdef as per section 20
of Documentation/process/coding-style.rst.

Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent 4a59f1fa

drivers/bluetooth/hci_bcm.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -373,15 +373,13 @@ static int bcm_close(struct hci_uart *hu)

		if (bdev) {
		bcm_gpio_set_power(bdev, false);
		#ifdef CONFIG_PM
		pm_runtime_disable(bdev->dev);
		pm_runtime_set_suspended(bdev->dev);

		if (bdev->irq > 0) {
		if (IS_ENABLED(CONFIG_PM) && bdev->irq > 0) {
		devm_free_irq(bdev->dev, bdev->irq, bdev);
		device_init_wakeup(bdev->dev, false);
		}
		#endif
		}
		mutex_unlock(&bcm_device_lock);

Admin message