From: Fabio Estevam Date: Tue, 18 Nov 2014 02:43:39 +0000 (-0200) Subject: mmc: mxs-mmc: Simplify PM hooks X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d13552908b2f3bdf917d0f4a308f69608c92c7e7;p=openwrt%2Fstaging%2Fblogic.git mmc: mxs-mmc: Simplify PM hooks By using SIMPLE_DEV_PM_OPS we can make the code smaller and cleaner. Signed-off-by: Fabio Estevam Signed-off-by: Ulf Hansson --- diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c index 339059a9a648..c049ac75a36a 100644 --- a/drivers/mmc/host/mxs-mmc.c +++ b/drivers/mmc/host/mxs-mmc.c @@ -702,7 +702,7 @@ static int mxs_mmc_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int mxs_mmc_suspend(struct device *dev) { struct mmc_host *mmc = dev_get_drvdata(dev); @@ -722,22 +722,17 @@ static int mxs_mmc_resume(struct device *dev) clk_prepare_enable(ssp->clk); return 0; } - -static const struct dev_pm_ops mxs_mmc_pm_ops = { - .suspend = mxs_mmc_suspend, - .resume = mxs_mmc_resume, -}; #endif +static SIMPLE_DEV_PM_OPS(mxs_mmc_pm_ops, mxs_mmc_suspend, mxs_mmc_resume); + static struct platform_driver mxs_mmc_driver = { .probe = mxs_mmc_probe, .remove = mxs_mmc_remove, .id_table = mxs_ssp_ids, .driver = { .name = DRIVER_NAME, -#ifdef CONFIG_PM .pm = &mxs_mmc_pm_ops, -#endif .of_match_table = mxs_mmc_dt_ids, }, };