public inbox for linux-bluetooth@vger.kernel.org
 help / color / mirror / Atom feed
From: Bastien Nocera <hadess@hadess.net>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 3/3] Bluetooth: btintel: Remove unneeded CONFIG_PM* #ifdef's
Date: Fri, 16 Jan 2026 13:50:44 +0100	[thread overview]
Message-ID: <20260116125803.598552-4-hadess@hadess.net> (raw)
In-Reply-To: <20260116125803.598552-1-hadess@hadess.net>

The functions are already disabled if CONFIG_PM or CONFIG_PM_SLEEP are
disabled through the use of SET_SYSTEM_SLEEP_PM_OPS() and
SET_RUNTIME_PM_OPS().

This increases build coverage and allows to drop a few #ifdef's.

Signed-off-by: Bastien Nocera <hadess@hadess.net>
---
 drivers/bluetooth/hci_intel.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/bluetooth/hci_intel.c b/drivers/bluetooth/hci_intel.c
index 20baf2895dec..52dca7520fa0 100644
--- a/drivers/bluetooth/hci_intel.c
+++ b/drivers/bluetooth/hci_intel.c
@@ -126,7 +126,6 @@ static int intel_wait_booting(struct hci_uart *hu)
 	return err;
 }
 
-#ifdef CONFIG_PM
 static int intel_wait_lpm_transaction(struct hci_uart *hu)
 {
 	struct intel_data *intel = hu->priv;
@@ -237,7 +236,6 @@ static int intel_lpm_resume(struct hci_uart *hu)
 
 	return 0;
 }
-#endif /* CONFIG_PM */
 
 static int intel_lpm_host_wake(struct hci_uart *hu)
 {
@@ -1066,7 +1064,6 @@ static const struct acpi_device_id intel_acpi_match[] = {
 MODULE_DEVICE_TABLE(acpi, intel_acpi_match);
 #endif
 
-#ifdef CONFIG_PM
 static int intel_suspend_device(struct device *dev)
 {
 	struct intel_device *idev = dev_get_drvdata(dev);
@@ -1090,9 +1087,7 @@ static int intel_resume_device(struct device *dev)
 
 	return 0;
 }
-#endif
 
-#ifdef CONFIG_PM_SLEEP
 static int intel_suspend(struct device *dev)
 {
 	struct intel_device *idev = dev_get_drvdata(dev);
@@ -1112,7 +1107,6 @@ static int intel_resume(struct device *dev)
 
 	return intel_resume_device(dev);
 }
-#endif
 
 static const struct dev_pm_ops intel_pm_ops = {
 	SET_SYSTEM_SLEEP_PM_OPS(intel_suspend, intel_resume)
-- 
2.52.0


  parent reply	other threads:[~2026-01-16 12:58 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-16 12:50 [PATCH 0/3] More CONFIG_PM* simplifications Bastien Nocera
2026-01-16 12:50 ` [PATCH 1/3] Bluetooth: btmtksdio: Simplify dev_pm_ops usage Bastien Nocera
2026-01-16 13:33   ` Paul Menzel
2026-01-16 13:42     ` Bastien Nocera
2026-01-16 13:36   ` More CONFIG_PM* simplifications bluez.test.bot
2026-01-16 19:29   ` [PATCH 1/3] Bluetooth: btmtksdio: Simplify dev_pm_ops usage kernel test robot
2026-01-16 12:50 ` [PATCH 2/3] Bluetooth: btnxpuart: Remove unneeded CONFIG_PM ifdef Bastien Nocera
2026-01-16 13:35   ` Paul Menzel
2026-01-16 14:35   ` Luiz Augusto von Dentz
2026-01-16 14:41     ` Bastien Nocera
2026-01-16 19:50   ` kernel test robot
2026-01-19  7:53     ` Neeraj Sanjay Kale
2026-01-19  9:10       ` Bastien Nocera
2026-01-20 16:42         ` Luiz Augusto von Dentz
2026-01-20 17:17           ` Bastien Nocera
2026-01-20 18:05             ` Luiz Augusto von Dentz
2026-01-20 21:38               ` Bastien Nocera
2026-01-16 12:50 ` Bastien Nocera [this message]
2026-01-16 13:36   ` [PATCH 3/3] Bluetooth: btintel: Remove unneeded CONFIG_PM* #ifdef's Paul Menzel
2026-01-16 21:49   ` kernel test robot

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=20260116125803.598552-4-hadess@hadess.net \
    --to=hadess@hadess.net \
    --cc=linux-bluetooth@vger.kernel.org \
    /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