Skip to content

Commit 6bb34cf

Browse files
andy-shevgregkh
authored andcommitted
serial: 8250_pnp: Switch to DEFINE_SIMPLE_DEV_PM_OPS()
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent aa0bb20 commit 6bb34cf

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

drivers/tty/serial/8250/8250_pnp.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111
#include <linux/module.h>
1212
#include <linux/pci.h>
13+
#include <linux/pm.h>
1314
#include <linux/pnp.h>
1415
#include <linux/string.h>
1516
#include <linux/kernel.h>
@@ -506,7 +507,7 @@ static void serial_pnp_remove(struct pnp_dev *dev)
506507
serial8250_unregister_port(line - 1);
507508
}
508509

509-
static int __maybe_unused serial_pnp_suspend(struct device *dev)
510+
static int serial_pnp_suspend(struct device *dev)
510511
{
511512
long line = (long)dev_get_drvdata(dev);
512513

@@ -516,7 +517,7 @@ static int __maybe_unused serial_pnp_suspend(struct device *dev)
516517
return 0;
517518
}
518519

519-
static int __maybe_unused serial_pnp_resume(struct device *dev)
520+
static int serial_pnp_resume(struct device *dev)
520521
{
521522
long line = (long)dev_get_drvdata(dev);
522523

@@ -526,14 +527,14 @@ static int __maybe_unused serial_pnp_resume(struct device *dev)
526527
return 0;
527528
}
528529

529-
static SIMPLE_DEV_PM_OPS(serial_pnp_pm_ops, serial_pnp_suspend, serial_pnp_resume);
530+
static DEFINE_SIMPLE_DEV_PM_OPS(serial_pnp_pm_ops, serial_pnp_suspend, serial_pnp_resume);
530531

531532
static struct pnp_driver serial_pnp_driver = {
532533
.name = "serial",
533534
.probe = serial_pnp_probe,
534535
.remove = serial_pnp_remove,
535536
.driver = {
536-
.pm = &serial_pnp_pm_ops,
537+
.pm = pm_sleep_ptr(&serial_pnp_pm_ops),
537538
},
538539
.id_table = pnp_dev_table,
539540
};

0 commit comments

Comments
 (0)