forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-10 cde9070d9970eef1f7ec2360586c802a16230ad8
kernel/drivers/tty/serial/8250/8250_pnp.c
....@@ -462,8 +462,8 @@
462462 return -ENODEV;
463463
464464 dev_dbg(&dev->dev,
465
- "Setup PNP port: port %lx, mem %pa, irq %d, type %d\n",
466
- uart.port.iobase, &uart.port.mapbase,
465
+ "Setup PNP port: port %#lx, mem %#llx, irq %u, type %u\n",
466
+ uart.port.iobase, (unsigned long long)uart.port.mapbase,
467467 uart.port.irq, uart.port.iotype);
468468
469469 if (flags & CIR_PORT) {
....@@ -498,10 +498,9 @@
498498 serial8250_unregister_port(line - 1);
499499 }
500500
501
-#ifdef CONFIG_PM
502
-static int serial_pnp_suspend(struct pnp_dev *dev, pm_message_t state)
501
+static int __maybe_unused serial_pnp_suspend(struct device *dev)
503502 {
504
- long line = (long)pnp_get_drvdata(dev);
503
+ long line = (long)dev_get_drvdata(dev);
505504
506505 if (!line)
507506 return -ENODEV;
....@@ -509,26 +508,25 @@
509508 return 0;
510509 }
511510
512
-static int serial_pnp_resume(struct pnp_dev *dev)
511
+static int __maybe_unused serial_pnp_resume(struct device *dev)
513512 {
514
- long line = (long)pnp_get_drvdata(dev);
513
+ long line = (long)dev_get_drvdata(dev);
515514
516515 if (!line)
517516 return -ENODEV;
518517 serial8250_resume_port(line - 1);
519518 return 0;
520519 }
521
-#else
522
-#define serial_pnp_suspend NULL
523
-#define serial_pnp_resume NULL
524
-#endif /* CONFIG_PM */
520
+
521
+static SIMPLE_DEV_PM_OPS(serial_pnp_pm_ops, serial_pnp_suspend, serial_pnp_resume);
525522
526523 static struct pnp_driver serial_pnp_driver = {
527524 .name = "serial",
528525 .probe = serial_pnp_probe,
529526 .remove = serial_pnp_remove,
530
- .suspend = serial_pnp_suspend,
531
- .resume = serial_pnp_resume,
527
+ .driver = {
528
+ .pm = &serial_pnp_pm_ops,
529
+ },
532530 .id_table = pnp_dev_table,
533531 };
534532