Re: [PATCH -tip][RFC] serial8250: update to dev_pm_ops

From: Frans Pop
Date: Wed Jul 08 2009 - 07:11:08 EST


Adding some CCs as there's no reply yet.

> 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.

One comment from me at the bottom.

> I have not tested it, but it compiles fine. Should I send in similar
> patches for other drivers that also give this message?

Note that comments and questions that should not go in the commit log
should go between the separator after the Signed-off-by line and the
patch.

> Signed-off-by: Erik Ekman <erik@xxxxxxx>
> ---

[Comments and questions go here]

>diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
>index fb867a9..dcbc6da 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,
>+};
>+
> 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,

Git warns that there is whitespace at the end of this line...

>        },
> };

Cheers,
FJP
N?§²æìr¸?yúè?Øb²X¬¶Ç§vØ^?)Þº{.nÇ+?·¥?{±?êçzX§¶?¡Ü¨}©?²Æ zÚ&j:+v?¨¾«?êçzZ+?Ê+zf£¢·h??§~?­?Ûiÿûàz¹®w¥¢¸??¨è­Ú&¢)ߢf?ù^jÇ«y§m?á@A«a¶Úÿ 0¶ìh®å?i