Return-Path: Message-Id: In-Reply-To: References: From: Lukas Wunner Date: Tue, 2 Jan 2018 20:08:40 +0100 Subject: [PATCH v2 07/10] Bluetooth: hci_bcm: Clean up unnecessary #ifdef MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 To: Marcel Holtmann , Johan Hedberg Cc: Mika Westerberg , Andy Shevchenko , Frederic Danis , Loic Poulain , Hans de Goede , Max Shavrick , Leif Liddy , Daniel Roschka , Ronald Tschalaer , "Peter Y. Chuang" , linux-bluetooth@vger.kernel.org List-ID: 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 Signed-off-by: Lukas Wunner --- drivers/bluetooth/hci_bcm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c index 632939d413df..dbf9d10dadf1 100644 --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c @@ -379,15 +379,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); -- 2.15.1