lkml.org 
[lkml]   [2006]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [rfc patch] Re: [patch] PM: suspend/resume debugging should depend on SOFTWARE_SUSPEND
    On Wed, 29 Nov 2006 11:30:31 +0100
    Mike Galbraith <efault@gmx.de> wrote:

    > On Wed, 2006-11-29 at 11:21 +0100, Mike Galbraith wrote:
    > > > The serial console appears to be innocent. The suspend/resume methods
    > > > for my 16550A serial port aren't even being _called_, apparently because
    > > > pnp swiped ttyS0.
    >
    > (ahem, bad aim with mouse, resuming)
    >
    > Well, after further rummaging, the suspend/resume methods aren't being
    > called because we're using 8250_pnp.c when CONFIG_PNP is set, and it
    > doesn't have any :) The below works for me, though I'm not sure it's
    > sufficient. If it is deemed sufficient, I'll submit it to Andrew.
    >
    > Add suspend/resume methods to 8250_pnp driver.
    >
    > --- 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 10:55:17.000000000 +0100
    > @@ -464,11 +464,38 @@ static void __devexit serial_pnp_remove(
    > serial8250_unregister_port(line - 1);
    > }
    >
    > +#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)

    > + if (!line)
    > + return -ENODEV;
    > + serial8250_suspend_port(line - 1);
    > + return 0;
    > +}
    > +
    > +static int serial_pnp_resume(struct pnp_dev *dev)
    > +{
    > + long line = (long)pnp_get_drvdata(dev);
    > +
    > + if (!line)
    > + return -ENODEV;
    > + serial8250_resume_port(line - 1);
    > + return 0;
    > +}

    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.
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-11-29 21:01    [from the cache]
    ©2003-2014 Jasper Spaans. hosted at Digital Ocean