[PATCH v2 1/3] Bluetooth: btmtksdio: Simplify dev_pm_ops usage
From: Bastien Nocera <hadess@hadess.net>
Date: 2026-01-19 10:29:27
Subsystem:
bluetooth drivers, the rest · Maintainers:
Marcel Holtmann, Luiz Augusto von Dentz, Linus Torvalds
This increases build coverage and allows to drop a few #ifdef's. SET_SYSTEM_SLEEP_PM_OPS() and SET_RUNTIME_PM_OPS() become no-ops if CONFIG_PM_SLEEP or CONFIG_PM are disabled. Signed-off-by: Bastien Nocera <hadess@hadess.net> --- drivers/bluetooth/btmtksdio.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c
index fba3ab6d30a5..3f941081ae6b 100644
--- a/drivers/bluetooth/btmtksdio.c
+++ b/drivers/bluetooth/btmtksdio.c@@ -1472,7 +1472,6 @@ static void btmtksdio_remove(struct sdio_func *func) hci_free_dev(hdev); } -#ifdef CONFIG_PM static int btmtksdio_runtime_suspend(struct device *dev) { struct sdio_func *func = dev_to_sdio_func(dev);
@@ -1495,7 +1494,7 @@ static int btmtksdio_runtime_suspend(struct device *dev) return err; } -static int btmtksdio_system_suspend(struct device *dev) +static int __maybe_unused btmtksdio_system_suspend(struct device *dev) { struct sdio_func *func = dev_to_sdio_func(dev); struct btmtksdio_dev *bdev;
@@ -1532,28 +1531,23 @@ static int btmtksdio_runtime_resume(struct device *dev) return err; } -static int btmtksdio_system_resume(struct device *dev) +static int __maybe_unused btmtksdio_system_resume(struct device *dev) { return btmtksdio_runtime_resume(dev); } static const struct dev_pm_ops btmtksdio_pm_ops = { - SYSTEM_SLEEP_PM_OPS(btmtksdio_system_suspend, btmtksdio_system_resume) - RUNTIME_PM_OPS(btmtksdio_runtime_suspend, btmtksdio_runtime_resume, NULL) + SET_SYSTEM_SLEEP_PM_OPS(btmtksdio_system_suspend, btmtksdio_system_resume) + SET_RUNTIME_PM_OPS(btmtksdio_runtime_suspend, btmtksdio_runtime_resume, NULL) }; -#define BTMTKSDIO_PM_OPS (&btmtksdio_pm_ops) -#else /* CONFIG_PM */ -#define BTMTKSDIO_PM_OPS NULL -#endif /* CONFIG_PM */ - static struct sdio_driver btmtksdio_driver = { .name = "btmtksdio", .probe = btmtksdio_probe, .remove = btmtksdio_remove, .id_table = btmtksdio_table, .drv = { - .pm = BTMTKSDIO_PM_OPS, + .pm = &btmtksdio_pm_ops, } };
--
2.52.0