On Wed, 2006-11-29 at 11:49 -0800, Andrew Morton wrote: > > +#ifdef CONFIG_PM > > +static int serial_pnp_suspend(struct pnp_dev *dev, pm_message_t state) > > +{ > > + long line = (long)pnp_get_drvdata(dev); > > Please avoid adding long lines. (heh, I kill me)
Ok. I also changed the place I got it from. > We'd usually do > > #else > #define serial_pnp_suspend NULL > #define serial_pnp_resume NULL > > here > > > + > > +#endif /* CONFIG_PM */ > > + > > static struct pnp_driver serial_pnp_driver = { > > .name = "serial", > > - .id_table = pnp_dev_table, > > .probe = serial_pnp_probe, > > .remove = __devexit_p(serial_pnp_remove), > > +#ifdef CONFIG_PM > > + .suspend = serial_pnp_suspend, > > + .resume = serial_pnp_resume, > > +#endif > > and hence omit the ifdefs here. New patch. Add suspend/resume methods to drivers/serial/8250_pnp.c. Tested on a P4/HT 16550A box, ttyS0 login survives across suspend to ram. Signed-off-by: Mike Galbraith <[EMAIL PROTECTED]> --- linux-2.6.19-rc6-mm2/drivers/serial/8250_pnp.c.org 2006-11-29 07:14:15.000000000 +0100 +++ linux-2.6.19-rc6-mm2/drivers/serial/8250_pnp.c 2006-11-29 20:49:33.000000000 +0100 @@ -459,16 +459,43 @@ serial_pnp_probe(struct pnp_dev *dev, co static void __devexit serial_pnp_remove(struct pnp_dev *dev) { - long line = (long)pnp_get_drvdata(dev); + int line = (long)pnp_get_drvdata(dev); if (line) serial8250_unregister_port(line - 1); } +#ifdef CONFIG_PM +static int serial_pnp_suspend(struct pnp_dev *dev, pm_message_t state) +{ + int line = (int)pnp_get_drvdata(dev); + + if (!line) + return -ENODEV; + serial8250_suspend_port(line - 1); + return 0; +} + +static int serial_pnp_resume(struct pnp_dev *dev) +{ + int line = (int)pnp_get_drvdata(dev); + + if (!line) + return -ENODEV; + serial8250_resume_port(line - 1); + return 0; +} +#else +#define serial_pnp_suspend NULL +#define serial_pnp_resume NULL +#endif /* CONFIG_PM */ + static struct pnp_driver serial_pnp_driver = { .name = "serial", - .id_table = pnp_dev_table, .probe = serial_pnp_probe, .remove = __devexit_p(serial_pnp_remove), + .suspend = serial_pnp_suspend, + .resume = serial_pnp_resume, + .id_table = pnp_dev_table, }; static int __init serial8250_pnp_init(void) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/