[PATCH] Bluetooth: hci_qca: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
Triet Hoang <[email protected]>
| Newsgroups | org.kernel.vger.linux-bluetooth,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
Convert the deprecated SIMPLE_DEV_PM_OPS to DEFINE_SIMPLE_DEV_PM_OPS and pm_sleep_ptr(). This lets us drop the __maybe_unused annotations from its suspend and resume callbacks, and reduces kernel size in case CONFIG_PM or CONFIG_PM_SLEEP is disabled. Signed-off-by: Triet Hoang <[email protected]> --- drivers/bluetooth/hci_qca.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 1222f97800f4..859b13814ff6 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -2643,7 +2643,7 @@ static void qca_serdev_shutdown(struct serdev_device *serdev) } } -static int __maybe_unused qca_suspend(struct device *dev) +static int qca_suspend(struct device *dev) { struct serdev_device *serdev = to_serdev_device(dev); struct qca_serdev *qcadev = serdev_device_get_drvdata(serdev); @@ -2757,7 +2757,7 @@ static int __maybe_unused qca_suspend(struct device *dev) return ret; } -static int __maybe_unused qca_resume(struct device *dev) +static int qca_resume(struct device *dev) { struct serdev_device *serdev = to_serdev_device(dev); struct qca_serdev *qcadev = serdev_device_get_drvdata(serdev); @@ -2769,7 +2769,7 @@ static int __maybe_unused qca_resume(struct device *dev) return 0; } -static SIMPLE_DEV_PM_OPS(qca_pm_ops, qca_suspend, qca_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(qca_pm_ops, qca_suspend, qca_resume); #ifdef CONFIG_OF static const struct of_device_id qca_bluetooth_of_match[] = { @@ -2823,7 +2823,7 @@ static struct serdev_device_driver qca_serdev_driver = { .name = "hci_uart_qca", .of_match_table = of_match_ptr(qca_bluetooth_of_match), .acpi_match_table = ACPI_PTR(qca_bluetooth_acpi_match), - .pm = &qca_pm_ops, + .pm = pm_sleep_ptr(&qca_pm_ops), #ifdef CONFIG_DEV_COREDUMP .coredump = hciqca_coredump, #endif -- 2.53.0