serial: 8250_exar: switch to DEFINE_SIMPLE_DEV_PM_OPS()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 19 Feb 2024 15:05:01 +0000 (17:05 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 2 Mar 2024 20:52:06 +0000 (21:52 +0100)
SIMPLE_DEV_PM_OPS() is deprecated, replace it with DEFINE_SIMPLE_DEV_PM_OPS()
and use pm_sleep_ptr() for setting the driver's PM routines. We can now
remove the __maybe_unused qualifier in the suspend and resume functions.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20240219150627.2101198-6-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250_exar.c

index cf3cd56..cf00335 100644 (file)
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
+#include <linux/pm.h>
 #include <linux/property.h>
 #include <linux/serial_core.h>
 #include <linux/serial_reg.h>
@@ -758,7 +759,7 @@ static void exar_pci_remove(struct pci_dev *pcidev)
                priv->board->exit(pcidev);
 }
 
-static int __maybe_unused exar_suspend(struct device *dev)
+static int exar_suspend(struct device *dev)
 {
        struct exar8250 *priv = dev_get_drvdata(dev);
        unsigned int i;
@@ -770,7 +771,7 @@ static int __maybe_unused exar_suspend(struct device *dev)
        return 0;
 }
 
-static int __maybe_unused exar_resume(struct device *dev)
+static int exar_resume(struct device *dev)
 {
        struct exar8250 *priv = dev_get_drvdata(dev);
        unsigned int i;
@@ -784,7 +785,7 @@ static int __maybe_unused exar_resume(struct device *dev)
        return 0;
 }
 
-static SIMPLE_DEV_PM_OPS(exar_pci_pm, exar_suspend, exar_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(exar_pci_pm, exar_suspend, exar_resume);
 
 static const struct exar8250_board pbn_fastcom335_2 = {
        .num_ports      = 2,
@@ -934,7 +935,7 @@ static struct pci_driver exar_pci_driver = {
        .probe          = exar_pci_probe,
        .remove         = exar_pci_remove,
        .driver         = {
-               .pm     = &exar_pci_pm,
+               .pm     = pm_sleep_ptr(&exar_pci_pm),
        },
        .id_table       = exar_pci_tbl,
 };