serial: max3100: Switch to DEFINE_SIMPLE_DEV_PM_OPS()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 9 Apr 2024 14:45:53 +0000 (17:45 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 9 Apr 2024 15:04:52 +0000 (17:04 +0200)
The SIMPLE_DEV_PM_OPS() is deprecated, replace it with the
DEFINE_SIMPLE_DEV_PM_OPS() and use pm_sleep_ptr() for setting
the driver's PM routines.

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

index 3004a95e573f6fe905d0ad3ed4a88f72713f8aef..db543eaa39c8ea887f5f98b3d2f29387e193c975 100644 (file)
@@ -21,6 +21,7 @@
 #include <linux/device.h>
 #include <linux/mod_devicetable.h>
 #include <linux/module.h>
+#include <linux/pm.h>
 #include <linux/property.h>
 #include <linux/serial_core.h>
 #include <linux/serial.h>
@@ -797,8 +798,6 @@ static void max3100_remove(struct spi_device *spi)
        mutex_unlock(&max3100s_lock);
 }
 
-#ifdef CONFIG_PM_SLEEP
-
 static int max3100_suspend(struct device *dev)
 {
        struct max3100_port *s = dev_get_drvdata(dev);
@@ -834,12 +833,7 @@ static int max3100_resume(struct device *dev)
        return 0;
 }
 
-static SIMPLE_DEV_PM_OPS(max3100_pm_ops, max3100_suspend, max3100_resume);
-#define MAX3100_PM_OPS (&max3100_pm_ops)
-
-#else
-#define MAX3100_PM_OPS NULL
-#endif
+static DEFINE_SIMPLE_DEV_PM_OPS(max3100_pm_ops, max3100_suspend, max3100_resume);
 
 static const struct spi_device_id max3100_spi_id[] = {
        { "max3100" },
@@ -857,7 +851,7 @@ static struct spi_driver max3100_driver = {
        .driver = {
                .name           = "max3100",
                .of_match_table = max3100_of_match,
-               .pm             = MAX3100_PM_OPS,
+               .pm             = pm_sleep_ptr(&max3100_pm_ops),
        },
        .probe          = max3100_probe,
        .remove         = max3100_remove,