Change mvsd platform driver to register pm ops using dev_pm_ops instead of legacy pm_ops infrastructure.
Signed-off-by: Shuah Khan <shuah...@samsung.com> --- drivers/mmc/host/mvsdio.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c index 4ddd83f..800a7fd 100644 --- a/drivers/mmc/host/mvsdio.c +++ b/drivers/mmc/host/mvsdio.c @@ -838,9 +838,9 @@ static int __exit mvsd_remove(struct platform_device *pdev) } #ifdef CONFIG_PM -static int mvsd_suspend(struct platform_device *dev, pm_message_t state) +static int mvsd_suspend(struct device *dev) { - struct mmc_host *mmc = platform_get_drvdata(dev); + struct mmc_host *mmc = platform_get_drvdata(to_platform_device(dev)); int ret = 0; if (mmc) @@ -849,9 +849,9 @@ static int mvsd_suspend(struct platform_device *dev, pm_message_t state) return ret; } -static int mvsd_resume(struct platform_device *dev) +static int mvsd_resume(struct device *dev) { - struct mmc_host *mmc = platform_get_drvdata(dev); + struct mmc_host *mmc = platform_get_drvdata(to_platform_device(dev)); int ret = 0; if (mmc) @@ -870,13 +870,14 @@ static const struct of_device_id mvsdio_dt_ids[] = { }; MODULE_DEVICE_TABLE(of, mvsdio_dt_ids); +static SIMPLE_DEV_PM_OPS(mvsd_dev_pm_ops, mvsd_suspend, mvsd_resume); + static struct platform_driver mvsd_driver = { .remove = __exit_p(mvsd_remove), - .suspend = mvsd_suspend, - .resume = mvsd_resume, .driver = { .name = DRIVER_NAME, .of_match_table = mvsdio_dt_ids, + .pm = &mvsd_dev_pm_ops, }, }; -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/