summaryrefslogtreecommitdiff
path: root/drivers/serial/pxa.c
diff options
context:
space:
mode:
authorMike Rapoport <mike@compulab.co.il>2009-07-21 17:48:43 +0300
committerEric Miao <eric.y.miao@gmail.com>2009-09-10 19:15:36 +0800
commitbf56c751fa25edf12528e7cef90fb276c3fff17a (patch)
tree6416739d99cc368fa1fdad38b014ea33512fa950 /drivers/serial/pxa.c
parent43ddc00696c96a265a7fc48050b32fd0ed9d59e7 (diff)
downloadlinux-3.10-bf56c751fa25edf12528e7cef90fb276c3fff17a.tar.gz
linux-3.10-bf56c751fa25edf12528e7cef90fb276c3fff17a.tar.bz2
linux-3.10-bf56c751fa25edf12528e7cef90fb276c3fff17a.zip
[ARM] pxa: update pxa serial driver to use 'struct dev_pm_ops'
Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'drivers/serial/pxa.c')
-rw-r--r--drivers/serial/pxa.c20
1 files changed, 14 insertions, 6 deletions
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index a48a8a13d87..514971fb5bf 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -726,9 +726,10 @@ static struct uart_driver serial_pxa_reg = {
.cons = PXA_CONSOLE,
};
-static int serial_pxa_suspend(struct platform_device *dev, pm_message_t state)
+#ifdef CONFIG_PM
+static int serial_pxa_suspend(struct device *dev)
{
- struct uart_pxa_port *sport = platform_get_drvdata(dev);
+ struct uart_pxa_port *sport = dev_get_drvdata(dev);
if (sport)
uart_suspend_port(&serial_pxa_reg, &sport->port);
@@ -736,9 +737,9 @@ static int serial_pxa_suspend(struct platform_device *dev, pm_message_t state)
return 0;
}
-static int serial_pxa_resume(struct platform_device *dev)
+static int serial_pxa_resume(struct device *dev)
{
- struct uart_pxa_port *sport = platform_get_drvdata(dev);
+ struct uart_pxa_port *sport = dev_get_drvdata(dev);
if (sport)
uart_resume_port(&serial_pxa_reg, &sport->port);
@@ -746,6 +747,12 @@ static int serial_pxa_resume(struct platform_device *dev)
return 0;
}
+static struct dev_pm_ops serial_pxa_pm_ops = {
+ .suspend = serial_pxa_suspend,
+ .resume = serial_pxa_resume,
+};
+#endif
+
static int serial_pxa_probe(struct platform_device *dev)
{
struct uart_pxa_port *sport;
@@ -825,11 +832,12 @@ static struct platform_driver serial_pxa_driver = {
.probe = serial_pxa_probe,
.remove = serial_pxa_remove,
- .suspend = serial_pxa_suspend,
- .resume = serial_pxa_resume,
.driver = {
.name = "pxa2xx-uart",
.owner = THIS_MODULE,
+#ifdef CONFIG_PM
+ .pm = &serial_pxa_pm_ops,
+#endif
},
};