openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

serial: pl010: Convert to modern PM ops 

Convert to modern PM ops and use the SIMPLE_DEV_PM_OPS macro to set up
the PM callbacks.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ulf Hansson 2013-12-03 11:04:27 +01:00 committed by Greg Kroah-Hartman
parent 311df74ade
commit 95468240d8
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/tty/serial/amba-pl010.c
View File

@ -756,9 +756,10 @@ static int pl010_remove(struct amba_device *dev)
return 0; return 0;
} }
static int pl010_suspend(struct amba_device *dev, pm_message_t state) #ifdef CONFIG_PM_SLEEP
static int pl010_suspend(struct device *dev)
{ {
struct uart_amba_port *uap = amba_get_drvdata(dev); struct uart_amba_port *uap = dev_get_drvdata(dev);
if (uap) if (uap)
uart_suspend_port(&amba_reg, &uap->port); uart_suspend_port(&amba_reg, &uap->port);
@ -766,15 +767,18 @@ static int pl010_suspend(struct amba_device *dev, pm_message_t state)
return 0; return 0;
} }
static int pl010_resume(struct amba_device *dev) static int pl010_resume(struct device *dev)
{ {
struct uart_amba_port *uap = amba_get_drvdata(dev); struct uart_amba_port *uap = dev_get_drvdata(dev);
if (uap) if (uap)
uart_resume_port(&amba_reg, &uap->port); uart_resume_port(&amba_reg, &uap->port);
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(pl010_dev_pm_ops, pl010_suspend, pl010_resume);
static struct amba_id pl010_ids[] = { static struct amba_id pl010_ids[] = {
{ {
@ -789,12 +793,11 @@ MODULE_DEVICE_TABLE(amba, pl010_ids);
static struct amba_driver pl010_driver = { static struct amba_driver pl010_driver = {
.drv = { .drv = {
.name = "uart-pl010", .name = "uart-pl010",
.pm = &pl010_dev_pm_ops,
}, },
.id_table = pl010_ids, .id_table = pl010_ids,
.probe = pl010_probe, .probe = pl010_probe,
.remove = pl010_remove, .remove = pl010_remove,
.suspend = pl010_suspend,
.resume = pl010_resume,
}; };
static int __init pl010_init(void) static int __init pl010_init(void)