lkml.org 
[lkml]   [2010]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    SubjectRe: [PATCH] rtc-cmos: fix suspend/resume
    Date
    On Thursday, December 16, 2010, Rafael J. Wysocki wrote:
    > On Thursday, December 16, 2010, Daniel Drake wrote:
    > > From: Paul Fox <pgf@laptop.org>
    > >
    > > rtc-cmos was setting suspend/resume hooks at the device_driver level.
    > > However, the platform bus code (drivers/base/platform.c) only looks
    > > for resume hooks at the dev_pm_ops level, or within the platform_driver.
    > >
    > > Switch rtc_cmos to use dev_pm_ops so that suspend/resume code is
    > > executed again.
    > >
    > > Signed-off-by: Paul Fox <pgf@laptop.org>
    > > Signed-off-by: Daniel Drake <dsd@laptop.org>
    > > ---
    > > drivers/rtc/rtc-cmos.c | 14 +++++++++-----
    > > 1 files changed, 9 insertions(+), 5 deletions(-)
    > >
    > > diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
    > > index 5856167..dfa5547 100644
    > > --- a/drivers/rtc/rtc-cmos.c
    > > +++ b/drivers/rtc/rtc-cmos.c
    > > @@ -850,7 +850,7 @@ static void __exit cmos_do_remove(struct device *dev)
    > >
    > > #ifdef CONFIG_PM
    > >
    > > -static int cmos_suspend(struct device *dev, pm_message_t mesg)
    > > +static int cmos_suspend(struct device *dev)
    > > {
    > > struct cmos_rtc *cmos = dev_get_drvdata(dev);
    > > unsigned char tmp;
    > > @@ -898,7 +898,7 @@ static int cmos_suspend(struct device *dev, pm_message_t mesg)
    > > */
    > > static inline int cmos_poweroff(struct device *dev)
    > > {
    > > - return cmos_suspend(dev, PMSG_HIBERNATE);
    > > + return cmos_suspend(dev);
    > > }
    > >
    > > static int cmos_resume(struct device *dev)
    > > @@ -1077,7 +1077,7 @@ static void __exit cmos_pnp_remove(struct pnp_dev *pnp)
    > >
    > > static int cmos_pnp_suspend(struct pnp_dev *pnp, pm_message_t mesg)
    > > {
    > > - return cmos_suspend(&pnp->dev, mesg);
    > > + return cmos_suspend(&pnp->dev);
    > > }
    > >
    > > static int cmos_pnp_resume(struct pnp_dev *pnp)
    > > @@ -1152,13 +1152,17 @@ static void cmos_platform_shutdown(struct platform_device *pdev)
    > > /* work with hotplug and coldplug */
    > > MODULE_ALIAS("platform:rtc_cmos");
    > >
    > > +static struct dev_pm_ops cmos_pm_ops = {
    > > + .suspend = cmos_suspend,
    > > + .resume = cmos_resume,
    > > +};
    >
    > That's not enough. Please also specify hibernation callbacks as documented
    > in Documentation/power/devices.txt (they can point to the same routines as the
    > suspend/resume ones).

    You can use the SIMPLE_DEV_PM_OPS() macro (defined in include/linux/pm.h)
    for this purpose.

    Thanks,
    Rafael


    > > +
    > > static struct platform_driver cmos_platform_driver = {
    > > .remove = __exit_p(cmos_platform_remove),
    > > .shutdown = cmos_platform_shutdown,
    > > .driver = {
    > > .name = (char *) driver_name,
    > > - .suspend = cmos_suspend,
    > > - .resume = cmos_resume,
    > > + .pm = &cmos_pm_ops,
    > > }
    > > };
    > >
    > >
    >
    >



    \
     
     \ /
      Last update: 2010-12-16 22:11    [W:0.047 / U:91.672 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site