Change au1xmmc platform driver to register pm ops using dev_pm_ops instead of legacy pm_ops. .pm hooks call existing legacy suspend and resume interfaces by passing in the right pm state.
Signed-off-by: Shuah Khan <[email protected]> --- drivers/mmc/host/au1xmmc.c | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c index f5443a6..1601f39 100644 --- a/drivers/mmc/host/au1xmmc.c +++ b/drivers/mmc/host/au1xmmc.c @@ -1154,7 +1154,7 @@ static int au1xmmc_remove(struct platform_device *pdev) } #ifdef CONFIG_PM -static int au1xmmc_suspend(struct platform_device *pdev, pm_message_t state) +static int __au1xmmc_suspend(struct platform_device *pdev, pm_message_t state) { struct au1xmmc_host *host = platform_get_drvdata(pdev); @@ -1167,7 +1167,22 @@ static int au1xmmc_suspend(struct platform_device *pdev, pm_message_t state) return 0; } -static int au1xmmc_resume(struct platform_device *pdev) +static int au1xmmc_suspend(struct device *dev) +{ + return __au1xmmc_suspend(to_platform_device(dev), PMSG_SUSPEND); +} + +static int au1xmmc_freeze(struct device *dev) +{ + return __au1xmmc_suspend(to_platform_device(dev), PMSG_FREEZE); +} + +static int au1xmmc_poweroff(struct device *dev) +{ + return __au1xmmc_suspend(to_platform_device(dev), PMSG_HIBERNATE); +} + +static int __au1xmmc_resume(struct platform_device *pdev) { struct au1xmmc_host *host = platform_get_drvdata(pdev); @@ -1175,19 +1190,31 @@ static int au1xmmc_resume(struct platform_device *pdev) return 0; } -#else -#define au1xmmc_suspend NULL -#define au1xmmc_resume NULL -#endif +static int au1xmmc_resume(struct device *dev) +{ + return __au1xmmc_resume(to_platform_device(dev)); +} + +static const struct dev_pm_ops au1xmmc_dev_pm_ops = { + .suspend = au1xmmc_suspend, + .resume = au1xmmc_resume, + /* Hibernate hooks */ + .freeze = au1xmmc_freeze, + .thaw = au1xmmc_resume, + .poweroff = au1xmmc_poweroff, + .restore = au1xmmc_resume, +}; +#endif static struct platform_driver au1xmmc_driver = { .probe = au1xmmc_probe, .remove = au1xmmc_remove, - .suspend = au1xmmc_suspend, - .resume = au1xmmc_resume, .driver = { .name = DRIVER_NAME, .owner = THIS_MODULE, +#ifdef CONFIG_PM + .pm = &au1xmmc_dev_pm_ops, +#endif }, }; -- 1.7.10.4 -- 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/
