Messages in this thread | | | From | "Rafael J. Wysocki" <> | Subject | Re: [PATCH -tip][RFC] serial8250: update to dev_pm_ops | Date | Sat, 25 Jul 2009 22:18:45 +0200 |
| |
On Saturday 25 July 2009, Frans Pop wrote: > On Wednesday 08 July 2009, Alan Cox wrote: > > On Wed, 8 Jul 2009 Frans Pop <elendil@planet.nl> wrote: > > > > From dmesg: > > > > Platform driver 'serial8250' needs updating - please use dev_pm_ops > > > > > > > > Is this how it should be done? > > > > > > Alan or Rafael can probably tell. > > > > No idea. I've not looked at this so your guess is as good as mine (but > > looks quite believable. I don't plan to do anything until someone who > > needs platform 8250 support sends a tested version of the change > > however. > > I have done a few of these myself now and followed all other similar > updates for other drivers. From that experience I can say that this update > is both trivial and correct. Hope you will reconsider your reluctance on > that basis. > > Below Erik's patch with the commit log cleaned up, one whitespace problem > fixed and my Reviewed-by added. > > Cheers, > FJP > > --- > From: Erik Ekman <erik@kryo.se> > Subject: serial8250: update to dev_pm_ops > > From dmesg: > Platform driver 'serial8250' needs updating - please use dev_pm_ops > > Signed-off-by: Erik Ekman <erik@kryo.se> > Reviewed-by: Frans Pop <elendil@planet.nl> > > diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c > index fb867a9..496c85f 100644 > --- a/drivers/serial/8250.c > +++ b/drivers/serial/8250.c > @@ -2982,42 +2982,46 @@ static int __devexit serial8250_remove(struct platform_device *dev) > return 0; > } > > -static int serial8250_suspend(struct platform_device *dev, pm_message_t state) > +static int serial8250_suspend(struct device *dev) > { > int i; > > for (i = 0; i < UART_NR; i++) { > struct uart_8250_port *up = &serial8250_ports[i]; > > - if (up->port.type != PORT_UNKNOWN && up->port.dev == &dev->dev) > + if (up->port.type != PORT_UNKNOWN && up->port.dev == dev) > uart_suspend_port(&serial8250_reg, &up->port); > } > > return 0; > } > > -static int serial8250_resume(struct platform_device *dev) > +static int serial8250_resume(struct device *dev) > { > int i; > > for (i = 0; i < UART_NR; i++) { > struct uart_8250_port *up = &serial8250_ports[i]; > > - if (up->port.type != PORT_UNKNOWN && up->port.dev == &dev->dev) > + if (up->port.type != PORT_UNKNOWN && up->port.dev == dev) > serial8250_resume_port(i); > } > > return 0; > } > > +static struct dev_pm_ops serial8250_pm_ops = { > + .suspend = serial8250_suspend, > + .resume = serial8250_resume,
Please don't forget about hibernation!
> +}; > + > static struct platform_driver serial8250_isa_driver = { > .probe = serial8250_probe, > .remove = __devexit_p(serial8250_remove), > - .suspend = serial8250_suspend, > - .resume = serial8250_resume, > .driver = { > .name = "serial8250", > .owner = THIS_MODULE, > + .pm = &serial8250_pm_ops, > }, > };
Best, Rafael
| |