adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

serial: sh-sci: Move over to dev_pm_ops.

Browse source 
Presently the boot log whines about suspend/resume hooks at the platform
driver level, move these over to dev_pm_ops.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2009-06-15 07:07:38 +09:00
parent 0c50f6f383
commit 6daa79b3c1
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/serial/sh-sci.c
View file

@ -1332,44 +1332,46 @@ err_unreg:
return ret; return ret;
} }
static int sci_suspend(struct platform_device *dev, pm_message_t state) static int sci_suspend(struct device *dev)
{ {
struct sh_sci_priv *priv = platform_get_drvdata(dev); struct sh_sci_priv *priv = dev_get_drvdata(dev);
struct sci_port *p; struct sci_port *p;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
list_for_each_entry(p, &priv->ports, node) list_for_each_entry(p, &priv->ports, node)
uart_suspend_port(&sci_uart_driver, &p->port); uart_suspend_port(&sci_uart_driver, &p->port);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
return 0; return 0;
} }
static int sci_resume(struct platform_device *dev) static int sci_resume(struct device *dev)
{ {
struct sh_sci_priv *priv = platform_get_drvdata(dev); struct sh_sci_priv *priv = dev_get_drvdata(dev);
struct sci_port *p; struct sci_port *p;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
list_for_each_entry(p, &priv->ports, node) list_for_each_entry(p, &priv->ports, node)
uart_resume_port(&sci_uart_driver, &p->port); uart_resume_port(&sci_uart_driver, &p->port);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
return 0; return 0;
} }
static struct dev_pm_ops sci_dev_pm_ops = {
.suspend = sci_suspend,
.resume = sci_resume,
};
static struct platform_driver sci_driver = { static struct platform_driver sci_driver = {
.probe = sci_probe, .probe = sci_probe,
.remove = __devexit_p(sci_remove), .remove = __devexit_p(sci_remove),
.suspend = sci_suspend,
.resume = sci_resume,
.driver = { .driver = {
.name = "sh-sci", .name = "sh-sci",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = &sci_dev_pm_ops,
}, },
}; };