Change bfin sdh 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/bfin_sdh.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/mmc/host/bfin_sdh.c b/drivers/mmc/host/bfin_sdh.c index 94fae2f..7b3e12f 100644 --- a/drivers/mmc/host/bfin_sdh.c +++ b/drivers/mmc/host/bfin_sdh.c @@ -638,10 +638,11 @@ static int sdh_remove(struct platform_device *pdev) } #ifdef CONFIG_PM -static int sdh_suspend(struct platform_device *dev, pm_message_t state) +static int sdh_suspend(struct device *dev) { - struct mmc_host *mmc = platform_get_drvdata(dev); - struct bfin_sd_host *drv_data = get_sdh_data(dev); + struct platform_device *pdev = to_platform_device(dev); + struct mmc_host *mmc = platform_get_drvdata(pdev); + struct bfin_sd_host *drv_data = get_sdh_data(pdev); int ret = 0; if (mmc) @@ -652,15 +653,16 @@ static int sdh_suspend(struct platform_device *dev, pm_message_t state) return ret; } -static int sdh_resume(struct platform_device *dev) +static int sdh_resume(struct device *dev) { - struct mmc_host *mmc = platform_get_drvdata(dev); - struct bfin_sd_host *drv_data = get_sdh_data(dev); + struct platform_device *pdev = to_platform_device(dev); + struct mmc_host *mmc = platform_get_drvdata(pdev); + struct bfin_sd_host *drv_data = get_sdh_data(pdev); int ret = 0; ret = peripheral_request_list(drv_data->pin_req, DRIVER_NAME); if (ret) { - dev_err(&dev->dev, "unable to request peripheral pins\n"); + dev_err(dev, "unable to request peripheral pins\n"); return ret; } @@ -676,13 +678,14 @@ static int sdh_resume(struct platform_device *dev) # define sdh_resume NULL #endif +static SIMPLE_DEV_PM_OPS(sdh_dev_pm_ops, sdh_suspend, sdh_resume); + static struct platform_driver sdh_driver = { .probe = sdh_probe, .remove = sdh_remove, - .suspend = sdh_suspend, - .resume = sdh_resume, .driver = { .name = DRIVER_NAME, + .pm = &sdh_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/